Jules Blok dfe5ed54a4 Merge pull request #2770 from Armada651/modal-hotkeys ... FrameTools: Disable hotkeys while a modal dialog is shown.		2015-07-25 13:02:13 +02:00
..
AudioCommon	Merge pull request #2659 from Armada651/openal-conv	2015-06-27 00:13:02 +02:00
Common	Merge pull request #2665 from AdmiralCurtiss/relative-memory-card-paths	2015-07-20 14:09:36 +10:00
Core	Core: Don't return true on IsRunning() when stopping emulation.	2015-07-22 09:44:39 +02:00
DiscIO	Merge pull request #2684 from TraceBullet/master	2015-07-14 10:56:12 +10:00
DolphinQt	Fix DoFileSearch returning the passed-in directories themselves.	2015-06-25 15:17:52 +02:00
DolphinWX	Merge pull request #2770 from Armada651/modal-hotkeys	2015-07-25 13:02:13 +02:00
InputCommon	Merge branch 'stable' into 'master'	2015-07-13 12:40:38 +12:00
UICommon	Options: merge SCoreStartupParameter into SConfig	2015-06-12 19:07:45 +02:00
VideoBackends	Video: stride in bytes rather than pixels	2015-07-25 02:48:56 +08:00
VideoCommon	Video: stride in bytes rather than pixels	2015-07-25 02:48:56 +08:00
CMakeLists.txt