Hamish Milne 4d6bd9b569 Fix the merge		2020-04-13 11:50:27 +01:00
..
android	android: add logging	2019-03-09 18:23:32 -06:00
audio_core	Merge branch 'master' into feature/savestates-2	2020-04-12 11:24:06 +01:00
citra	Merge pull request #5083 from zhaowenlan1779/video-dumping-update	2020-04-03 21:15:32 -05:00
citra_qt	Fix the merge	2020-04-13 11:50:27 +01:00
common	Merge remote-tracking branch 'upstream/master' into feature/savestates-2	2020-04-12 22:26:24 +01:00
core	Show save/load errors to the user	2020-04-12 23:12:15 +01:00
dedicated_room	Fix moderation by room host in dedicated rooms	2019-11-17 09:59:54 -05:00
input_common	Merge pull request #5123 from vitor-k/disable-hidapi	2020-04-03 23:23:03 -05:00
network	Merge branch 'master' into feature/savestates-2	2020-04-12 11:24:06 +01:00
tests	clang format fixes etc.	2020-03-31 18:27:33 +01:00
video_core	Merge branch 'master' into feature/savestates-2	2020-04-12 11:24:06 +01:00
web_service	HTTP_C::Implement Context::MakeRequest (#4754)	2020-02-21 19:04:04 +01:00
.clang-format	add java to .clang-format	2019-02-22 16:29:19 -06:00
CMakeLists.txt	Code review actions (plus hopefully fix the linux CI)	2020-03-31 17:54:28 +01:00