Lioncash
81adf46d1d
bcat: In-class initialize ProgressServiceBackend's impl member
...
Allows us to remove a constructor initializer list.
2019-10-06 15:38:12 -04:00
Lioncash
3fcd2180e4
bcat: Make ProgressServiceBackend's constructor take a std::string_view
...
Given the string is appended to another, we can make it a view so a
redundant full copy of the string isn't made.
2019-10-06 15:38:09 -04:00
Zach Hilman
81fff7aec0
qt: Fix game name format error
2019-10-06 15:07:04 -04:00
Lioncash
f2fa16b609
bcat: Make ProgressServiceBackend's GetEvent() const
...
This member function doesn't modify internal member state, so it can be
marked const.
2019-10-06 14:03:18 -04:00
Lioncash
329081fcb7
boxcat: Silence an unused variable warning
...
On parse errors, we can log out the explanatory string indicating what
the parsing error was, rather than just ignoring the variable and
returning an overly broad error code.
2019-10-06 14:00:32 -04:00
Lioncash
839b38c404
core/core: Remove unused header
...
This isn't used anywhere in either the cpp or header file.
2019-10-06 13:54:27 -04:00
Lioncash
f1382cf0e7
core: Remove Core::CurrentProcess()
...
This only encourages the use of the global system instance (which will
be phased out long-term). Instead, we use the direct system function
call directly to remove the appealing but discouraged short-hand.
2019-10-06 13:53:12 -04:00
Lioncash
69f16ba50e
hle/service: Replace global system instance calls with instance-based ones
...
Migrates the HLE service code off the use of directly accessing the
global system instance where trivially able to do so.
This removes all usages of Core::CurrentProcess from the service code,
only 8 occurrences of this function exist elsewhere. There's still quite
a bit of "System::GetInstance()" being used, however this was able to
replace a few instances.
2019-10-06 13:42:23 -04:00
bunnei
deecd7f074
Merge pull request #2942 from ReinUsesLisp/clang-warnings
...
Silence miscellaneous warnings
2019-10-05 20:41:20 -04:00
bunnei
6f511c8006
Merge pull request #2943 from DarkLordZach/azure-titlebars-v2
...
ci: Add custom titlebars for mainline and patreon
2019-10-05 19:29:35 -04:00
Lioncash
f883cd4f0e
video_core/control_flow: Eliminate variable shadowing warnings
2019-10-05 09:14:27 -04:00
Lioncash
25702b6256
video_core/control_flow: Eliminate pessimizing moves
...
These can inhibit the ability of a compiler to perform RVO.
2019-10-05 09:14:27 -04:00
Lioncash
d82b181d44
video_core/ast: Unindent most of IsFullyDecompiled() by one level
2019-10-05 09:14:27 -04:00
Lioncash
6c41d1cd7e
video_core/ast: Make ShowCurrentState() take a string_view instead of std::string
...
Allows the function to be non-allocating in terms of the output string.
2019-10-05 09:14:27 -04:00
Lioncash
3c54edae24
video_core/ast: Eliminate variable shadowing warnings
2019-10-05 09:14:26 -04:00
Lioncash
5a0a9c7449
video_core/ast: Replace std::string with a constexpr std::string_view
...
Same behavior, but without the need to heap allocate
2019-10-05 09:14:26 -04:00
Lioncash
3a20d9734f
video_core/ast: Default the move constructor and assignment operator
...
This is behaviorally equivalent and also fixes a bug where some members
weren't being moved over.
2019-10-05 09:14:26 -04:00
Lioncash
43503a69bf
video_core/{ast, expr}: Organize forward declaration
...
Keeps them alphabetically sorted for readability.
2019-10-05 09:14:26 -04:00
Lioncash
50ad745585
video_core/expr: Supply operator!= along with operator==
...
Provides logical symmetry to the interface.
2019-10-05 09:14:26 -04:00
Lioncash
8eb1398f8d
video_core/{ast, expr}: Use std::move where applicable
...
Avoids unnecessary atomic reference count increments and decrements.
2019-10-05 09:14:23 -04:00
Lioncash
8e0c80f269
video_core/ast: Supply const accessors for data where applicable
...
Provides const equivalents of data accessors for use within const
contexts.
2019-10-05 08:22:03 -04:00
David
3728bbc22a
Merge pull request #2888 from FernandoS27/decompiler2
...
Shader_IR: Implement a full control flow decompiler for the shader IR.
2019-10-05 21:52:20 +10:00
Zach Hilman
57fe7fdec0
qt: Change titlebar formatting
2019-10-05 00:10:04 -04:00
Zach Hilman
3d4a0b94e3
common: Add additional SCM revision fields
2019-10-05 00:09:49 -04:00
ReinUsesLisp
fe7f20e659
maxwell_3d: Add dirty flags for depth bounds values
...
This is useful in Vulkan where we want to update depth bounds without
caring if it's enabled or disabled through vkCmdSetDepthBounds.
2019-10-05 04:07:47 +00:00
Fernando Sahmkow
538f5880ff
GL_Renderer: Remove lefting snippet.
2019-10-04 19:59:55 -04:00
Fernando Sahmkow
75395605d6
NvFlinger: Remove leftover from corrections and clang format.
2019-10-04 19:59:54 -04:00
Fernando Sahmkow
9f2719d1a4
Gl_Rasterizer: Protect CPU Memory mapping from multiple threads.
2019-10-04 19:59:53 -04:00
Fernando Sahmkow
3f104464de
Core: Wait for GPU to be idle before shutting down.
2019-10-04 19:59:53 -04:00
Fernando Sahmkow
69fa2e6525
Nvdrv: Correct Event setup in Nvdrv
...
Events are supposed to be cleared on quering. This fixes that issue.
2019-10-04 19:59:52 -04:00
Fernando Sahmkow
782b7a0ca4
NVFlinger: Reverse the change that only signaled events on buffer acquire.
...
This has been hardware tested and it seems that NVFlinger will still
signal even if there are no buffers to present.
2019-10-04 19:59:51 -04:00
Fernando Sahmkow
ffc2ce89a0
Nvdrv: Do framelimiting only in the CPU Thread
2019-10-04 19:59:50 -04:00
Fernando Sahmkow
976d9ef43c
NvFlinger: Don't swap buffers if a frame is missing and always trigger event in sync gpu.
2019-10-04 19:59:49 -04:00
Fernando Sahmkow
5b5e60ffec
GPU_Async: Correct fences, display events and more.
...
This commit uses guest fences on vSync event instead of an articial fake
fence we had.
It also corrects to keep signaling display events while loading the game
as the OS is suppose to send buffers to vSync during that time.
2019-10-04 19:59:48 -04:00
Fernando Sahmkow
4e9f975935
Nvdrv: Correct Async regression and avoid signaling empty buffer vsyncs
2019-10-04 19:59:47 -04:00
ReinUsesLisp
25ee892d5e
audio/audout_u: Change formatting for old clang-format versions
2019-10-04 23:51:56 +00:00
ReinUsesLisp
e1afeec76d
yuzu/game_list_worker: Silence warnings
2019-10-04 23:41:22 +00:00
ReinUsesLisp
f297e9ff22
yuzu/game_list: Silence -Wswitch and -Wunused-variable
2019-10-04 23:41:22 +00:00
ReinUsesLisp
2b9b695fa7
yuzu/configure_service: Silence -Wswitch
2019-10-04 23:41:22 +00:00
ReinUsesLisp
e03f46fb0e
yuzu_tester: Remove unused variable
2019-10-04 23:41:22 +00:00
ReinUsesLisp
8d0b1a957e
service/nvdrv: Silence -Wswitch
2019-10-04 23:41:22 +00:00
ReinUsesLisp
5c907f85fc
service/nfp: Silence -Wunused and -Wswitch
2019-10-04 23:41:22 +00:00
ReinUsesLisp
0759df0aff
service/hid: Silence -Wunused and -Wswitch
2019-10-04 23:41:22 +00:00
ReinUsesLisp
ab6f8d8a1e
service/am: Silence -Wreorder
2019-10-04 23:41:21 +00:00
ReinUsesLisp
634c6e24b0
service/hid: Remove unused system reference
2019-10-04 23:41:21 +00:00
ReinUsesLisp
1dbd22e695
service/friend: Remove unused field
2019-10-04 23:41:21 +00:00
ReinUsesLisp
99db7d23dd
service/filesystem: Silence -Wunused-variable
2019-10-04 23:41:21 +00:00
ReinUsesLisp
8566096794
service/bcat: Silence -Wreorder and -Wunused
2019-10-04 23:41:21 +00:00
ReinUsesLisp
87e7cc2d5a
service/audio: Silence -Wunused
2019-10-04 23:28:34 +00:00
ReinUsesLisp
aacb473aa2
service/apm: Silence -Wunused and -Wreorder
2019-10-04 23:28:34 +00:00
ReinUsesLisp
f4417eab8f
common/file_util: Silence -Wswitch
2019-10-04 23:28:34 +00:00
Fernando Sahmkow
ab47a660c8
Texture_Cache: Blit Deduction corrections and simplifications.
2019-10-04 18:53:47 -04:00
Fernando Sahmkow
2036504a82
TextureCache: Add the ability to deduce if two textures are depth on blit.
2019-10-04 18:53:46 -04:00
Fernando Sahmkow
e6eae4b815
Shader_ir: Address feedback
2019-10-04 18:52:57 -04:00
Fernando Sahmkow
3c09d9abe6
Shader_Ir: Address Feedback and clang format.
2019-10-04 18:52:57 -04:00
Fernando Sahmkow
507a9c6a40
vk_shader_decompiler: Correct Branches inside conditionals.
2019-10-04 18:52:56 -04:00
Fernando Sahmkow
000ad558dd
vk_shader_decompiler: Clean code and be const correct.
2019-10-04 18:52:55 -04:00
Fernando Sahmkow
7c756baa77
Shader_IR: clean up AST handling and add documentation.
2019-10-04 18:52:55 -04:00
Fernando Sahmkow
5ea740beb5
Shader_IR: Correct OutwardMoves for Ifs
2019-10-04 18:52:54 -04:00
Fernando Sahmkow
100a4bd988
vk_shader_compiler: Don't enclose branches with if(true) to avoid crashing AMD
2019-10-04 18:52:54 -04:00
Fernando Sahmkow
189a50bc2a
gl_shader_decompiler: Refactor and address feedback.
2019-10-04 18:52:53 -04:00
Fernando Sahmkow
b3c46d6948
Shader_IR: corrections and clang-format
2019-10-04 18:52:53 -04:00
Fernando Sahmkow
466cd52ad4
vk_shader_compiler: Correct SPIR-V AST Decompiling
2019-10-04 18:52:52 -04:00
Fernando Sahmkow
2e9a810423
Shader_IR: allow else derivation to be optional.
2019-10-04 18:52:52 -04:00
Fernando Sahmkow
ca9901867e
vk_shader_compiler: Implement the decompiler in SPIR-V
2019-10-04 18:52:51 -04:00
Fernando Sahmkow
0366c18d87
Shader_IR: mark labels as unused for partial decompile.
2019-10-04 18:52:51 -04:00
Fernando Sahmkow
47e4f6a52c
Shader_Ir: Refactor Decompilation process and allow multiple decompilation modes.
2019-10-04 18:52:50 -04:00
Fernando Sahmkow
38fc995f6c
gl_shader_decompiler: Implement AST decompiling
2019-10-04 18:52:50 -04:00
Fernando Sahmkow
6fdd501113
shader_ir: Declare Manager and pass it to appropiate programs.
2019-10-04 18:52:49 -04:00
Fernando Sahmkow
8be6e1c522
shader_ir: Corrections to outward movements and misc stuffs
2019-10-04 18:52:48 -04:00
Fernando Sahmkow
4fde66e609
shader_ir: Add basic goto elimination
2019-10-04 18:52:48 -04:00
Fernando Sahmkow
c17953978b
shader_ir: Initial Decompile Setup
2019-10-04 18:52:47 -04:00
Fernando Sahmkow
678d9ccad6
SDL: Fix missing header
...
This fixes linux and mingw builds.
2019-10-04 18:14:11 -04:00
bunnei
94c34f23d7
Merge pull request #2896 from FearlessTobi/port-4950
...
Port citra-emu/citra#4950 : "Add FPS to SDL title bar"
2019-10-04 15:51:03 -04:00
bunnei
7fbaf62bac
Merge pull request #2936 from VPeruS/use-isallzeroarray
...
[crypto] Use IsAllZeroArray helper function
2019-10-04 15:44:35 -04:00
bunnei
c818728513
Merge pull request #2898 from FearlessTobi/port-4004
...
Port citra-emu/citra#4004 : "qt_themes: add two colorful themes"
2019-10-03 21:34:40 -04:00
David
9aac7fbc22
Merge pull request #2539 from DarkLordZach/bcat
...
bcat: Implement BCAT service and connect to yuzu Boxcat server
2019-10-03 19:06:13 +10:00
vperus
29b1d0db0f
[crypto] Use IsAllZeroArray helper function
2019-10-02 19:20:45 +03:00
Zach Hilman
e55d086cc9
qt: Add service dialog
2019-10-02 08:35:43 -04:00
bunnei
5e677a3178
Merge pull request #2904 from ogniK5377/better-signal-hid
...
Signal styleset changes at a better time
2019-10-01 10:58:02 -04:00
Zach Hilman
5d86c52a3a
boxcat: Use updated game-asset API URL and tags
2019-10-01 09:13:31 -04:00
Zach Hilman
19c466dfb1
bcat: Add FSC accessors for BCAT data
...
Ports BCAT to use FSC interface
2019-10-01 09:13:09 -04:00
ReinUsesLisp
69c806feb6
gl_rasterizer: Fix polygon offset units
...
For some reason hardware divides polygon offset units by two. This is
visible since drivers multiply the application requested polygon offset
by two.
2019-10-01 02:00:23 -03:00
Zach Hilman
bcf1eafb8b
boxcat: Implement events global field
2019-09-30 17:28:23 -04:00
Zach Hilman
2d410ddf4d
bcat: Implement DeliveryCacheProgressImpl structure
...
Huge thanks to lioncash for re-ing this for me.
2019-09-30 17:27:23 -04:00
Zach Hilman
92b70a3bf9
boxcat: Use Etag header names for file digest
2019-09-30 17:27:23 -04:00
Zach Hilman
e8183f9ef0
boxcat: Add downloading and client for launch parameter data
2019-09-30 17:27:23 -04:00
Zach Hilman
b8ce87103d
bcat: Add backend function for BCAT Indirect (launch parameter)
...
Returns the data that should be returned by PopLaunchParameter kind=ApplicationSpecific.
2019-09-30 17:27:23 -04:00
Zach Hilman
ea17b294ea
bcat: Expose CreateBackendFromSettings helper function
2019-09-30 17:27:23 -04:00
Zach Hilman
fe8c7e66e2
am: Unstub PopLaunchParameter and add bcat connection for app-specific data
...
Previously we were simply returning the account-preselect structure all times but if passed with a different mode the game expects application-specific data. This also adds a hook for BCAT into this allowing us to send the launch parameter through bcat,
2019-09-30 17:27:23 -04:00
Zach Hilman
02f8f1bb3e
configure_service: Allow Qt to open external links
2019-09-30 17:26:10 -04:00
Zach Hilman
f0551aef09
yuzu: Add UI tab to configure BCAT services
...
Also displays current events if boxcat is selected.
2019-09-30 17:26:10 -04:00
Zach Hilman
102db206e0
bcat: Implement cmd 90201 ClearDeliveryCacheStorage
...
Takes a title ID and simply deletes all the data for that title ID's bcat. Invokes the respective backend command.
2019-09-30 17:23:26 -04:00
Zach Hilman
1bde5a3c6a
bcat: Implement cmd 30100 SetPassphrase
...
Takes a title ID and passphrase (0x40 byte string) and passes it to the backend.
2019-09-30 17:23:26 -04:00
Zach Hilman
86773a7f08
bcat: Implement cmd RequestSyncDeliveryCache and variant
...
Variant also supports only updating a single directory. These just both invoke backend commands.
2019-09-30 17:23:26 -04:00
Zach Hilman
cb7c96b96a
bcat: Implement IDeliveryCacheProgressService commands
...
Used to query completion status and events for the current delivery task.
2019-09-30 17:23:26 -04:00
Zach Hilman
f352ad5c93
bcat: Implement IDeliveryCacheFileService commands
...
Used to read the contents of files and access their metadata.
2019-09-30 17:23:26 -04:00
Zach Hilman
8812018c1d
bcat: Implement IDeliveryCacheDirectoryService commands
...
Used to list and get directories at the root level.
2019-09-30 17:23:26 -04:00
Zach Hilman
862131ead9
bcat: Implement IDeliveryCacheStorageService commands
...
Used to create subclasses to manage files and directories and to list directories.
2019-09-30 17:23:26 -04:00
Zach Hilman
78d146f907
bcat: Add commands to create IDeliveryCacheStorageService
...
Used to access contents of download.
2019-09-30 17:23:26 -04:00
Zach Hilman
68658a8385
module: Create BCAT backend based upon Settings value on construction
2019-09-30 17:23:26 -04:00
Zach Hilman
2903f3524e
bcat: Add BCAT backend for Boxcat service
...
Downloads content from yuzu servers and unpacks it into the temporary directory provided. Fully supports all Backend features except passphrase.
2019-09-30 17:21:53 -04:00
Zach Hilman
2c0b75a744
bcat: Add backend class to generify the functions of BCAT
...
Provides the most abstract simplified functions of BCAT as functions. Also includes a NullBackend class which is just a no-op.
2019-09-30 17:21:53 -04:00
Zach Hilman
647992e666
settings: Add option to set BCAT backend
2019-09-30 17:21:53 -04:00
Zach Hilman
532ec459b8
nifm: Signal to applications that internet access is available
2019-09-30 17:21:53 -04:00
Zach Hilman
f6c53526b3
core/loader: Track the NSO build ID of the current process
2019-09-30 17:21:53 -04:00
Zach Hilman
943662dc3c
applets: Add accessor for AppletFrontendSet
...
Allows other services to call applets without using LLE.
2019-09-30 17:20:49 -04:00
Zach Hilman
f2073217a4
filesystem: Add getter for BCAT temporary directory
2019-09-30 17:20:49 -04:00
Zach Hilman
c00ed8f4ff
vfs: Add function to extract ZIP file into virtual filesystem
2019-09-30 17:18:38 -04:00
bunnei
dc29919bbe
Revert "arm_dynarmic: Check if jit is nullptr when preparing reschedule"
2019-09-29 21:54:19 -04:00
bunnei
28538bba9c
Merge pull request #2574 from DarkLordZach/dynarmic-jit-nullptr
...
arm_dynarmic: Check if jit is nullptr when preparing reschedule
2019-09-29 21:44:10 -04:00
FreddyFunk
7b93c4646a
Services::ES fix casting warnings
2019-09-29 22:45:09 +02:00
FearlessTobi
b89fb6e1be
yuzu: Pause when in background
...
Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2019-09-26 14:54:31 +02:00
David Marcec
77fbf29047
Signal styleset changes at a better time
...
We should signal when a net controller is added and our event should be manual, not automatic.
2019-09-24 17:24:37 +10:00
ReinUsesLisp
f926230ab1
gl_shader_decompiler: Add tailing return for HUnpack2
2019-09-24 01:03:59 -03:00
ReinUsesLisp
25bfaffdff
gl_shader_decompiler: Fix clang build issues
2019-09-24 01:03:27 -03:00
bunnei
376f1a4432
Merge pull request #2869 from ReinUsesLisp/suld
...
shader/image: Implement SULD and fix SUATOM
2019-09-23 21:47:03 -04:00
Zach Hilman
c4f3400bea
card_image: Add accessors for raw partitions in XCI
2019-09-22 21:51:46 -04:00
Zach Hilman
3952c73aee
card_image: Lazily load partitions in XCI
2019-09-22 21:50:29 -04:00
Zach Hilman
3895f7e456
pfs: Provide accessors for file sizes and offsets
2019-09-22 21:44:36 -04:00
Zach Hilman
14248685af
cmake: Add SCM detection for Azure
2019-09-22 17:23:10 -04:00
Zach Hilman
6212df3beb
lm: Flush manager output on core shutdown
2019-09-22 12:34:55 -04:00
Zach Hilman
fa6531ab0f
lm: Rename Initialize to Log and implement with manager/reporter
...
Allows saving and clearer output of data.
2019-09-22 12:34:55 -04:00
Zach Hilman
ef9a7fa1f5
lm: Implement manager class to output to reporter
2019-09-22 12:34:55 -04:00
Zach Hilman
4153bd8d17
core: Add LM::Manager to system
...
Allows centralized control over logging mechanisms.
2019-09-22 12:34:55 -04:00
Zach Hilman
82bf055eca
reporter: Add log output for packaged lm log data
...
Takes the vector from head to tail of log data and saves it.
2019-09-22 12:34:33 -04:00
FearlessTobi
855e7237ff
qt_themes: add two colorful themes
...
These two colorful themes are based on the Default and Dark themes, and contain icons that are colored rather than black and white. These icons come from icons8.com and they have been slightly revised by me. I'm pretty sure I was licensed to use them for Citra.
Co-Authored-By: Pengfei Zhu <zhupengfei321@sina.cn>
2019-09-22 16:42:00 +02:00
David
aaec1562f8
Merge pull request #2683 from DarkLordZach/lock-exit
...
am: Implement exit locking and self exit commands
2019-09-23 00:37:12 +10:00
David
a9abf4e7f8
Merge pull request #2889 from FearlessTobi/adwsawdawd
...
Add missing include
2019-09-23 00:30:12 +10:00
Zach Hilman
b835d76311
Merge pull request #2876 from ogniK5377/AcquireNpadStyleSetUpdateEventHandle-fix
...
AcquireNpadStyleSetUpdateEventHandle should have a separate event for each controller type
2019-09-22 10:06:48 -04:00
Zach Hilman
b7725812ac
Merge pull request #2877 from ogniK5377/framecount-rev7
...
Added frame_count for REV5 audio renderer
2019-09-22 10:05:44 -04:00
Zach Hilman
9f3bf6d157
main: Use const on all variable initializations
2019-09-22 10:02:07 -04:00
David
e31c15606b
Merge pull request #2895 from FearlessTobi/debug-logs
...
service/acc: Lower log severity from INFO to DEBUG
2019-09-22 23:50:49 +10:00
jroweboy
64dbc92b61
Add FPS to SDL title bar
...
Also fix a small issue with incorrect shutdown ordering in SDL.
Previously the system would still be running so the telemetry task
didn't launch and detached_tasks would assert(count == 0)
2019-09-22 15:49:39 +02:00
FearlessTobi
e22e0eb8d7
Add missing include
2019-09-22 15:47:21 +02:00
Fernando Sahmkow
a755f24369
Merge pull request #2873 from ogniK5377/new-ioctls
...
Initial implementation of Ioctl2 & Ioctl3
2019-09-22 09:45:29 -04:00
David Marcec
59fd910355
removed comment
2019-09-22 23:42:52 +10:00
David Marcec
654427d4d0
Rebased
2019-09-22 23:42:41 +10:00
Fernando Sahmkow
4ace69de9c
Merge pull request #2884 from ogniK5377/deglobal-sys-services
...
Remove usage of System::CurrentInterface() from most services
2019-09-22 09:38:13 -04:00
FearlessTobi
82979296d2
service/acc: Lower log severity from INFO to DEBUG
...
According to ogniK, this should have always been Debug and not Info.
2019-09-22 15:15:07 +02:00
David
9d69206cd0
Merge pull request #2870 from FernandoS27/multi-draw
...
Implement a MME Draw commands Inliner and correct host instance drawing
2019-09-22 23:13:02 +10:00
Fernando Sahmkow
822ca65d69
Merge pull request #2891 from FearlessTobi/rod-tex
...
video_core: Implement RGBX16F and lower Surface Copy log severity
2019-09-22 09:11:28 -04:00
David
3bfba23362
Merge pull request #2867 from ReinUsesLisp/configure-framebuffers-clean
...
gl_rasterizer: Remove unused code paths from ConfigureFramebuffers
2019-09-22 23:10:07 +10:00
Fernando Sahmkow
68f5aff64f
Maxwell3D: Corrections and refactors to MME instance refactor
2019-09-22 07:23:13 -04:00
David Marcec
9513abbb0a
removed unneeded semicolon
2019-09-22 18:50:34 +10:00
David Marcec
d961d5479e
Revert "Merge pull request #2709 from DarkLordZach/oss-ext-fonts-1"
...
This reverts commit fa1c60c33e
, reversing
changes made to e34899067b
.
2019-09-22 17:47:25 +10:00
David Marcec
e73ac40eaa
Removed reference to core timing to nvflinger and used system instead
2019-09-22 16:55:15 +10:00
David Marcec
aed884d121
marked controller constructors as explicit
2019-09-22 16:41:38 +10:00
David Marcec
bd1c4ec9a0
Rebase
2019-09-22 16:41:34 +10:00
David Marcec
fcdbf0bc53
Rebase
2019-09-22 16:40:58 +10:00