adelikat 4ae0b2cd22 Merge branch 'master' into waterbox2 ... Conflicts: BizHawk.Client.EmuHawk/MainForm.Events.cs BizHawk.Client.EmuHawk/MainForm.cs		2017-06-04 18:18:11 -05:00
..
bk2	Merge branch 'master' into waterbox2	2017-06-04 18:18:11 -05:00
bkm	Misc cleanups in Client.Common	2017-05-19 13:17:07 -05:00
conversions	Client.Common cleanups	2017-05-18 11:36:38 -05:00
import	Misc cleanups in Client.Common	2017-05-19 13:17:07 -05:00
interfaces	add ui to switch to Atari7800Hawk, still not useable by humans, needs gamedb stuff	2017-05-27 08:56:25 -05:00
tasproj	tastudio: fix marker copies being recorded to history when branch backup is created	2017-05-29 21:20:46 +03:00
HeaderKeys.cs	misc Client.Common code cleanups	2017-05-09 13:19:55 -05:00
MovieService.cs	heh	2017-05-10 07:45:23 -04:00
MovieSession.cs	add ui to switch to Atari7800Hawk, still not useable by humans, needs gamedb stuff	2017-05-27 08:56:25 -05:00
MultitrackRecording.cs	heh	2017-05-10 07:45:23 -04:00
PlatformFrameRates.cs	VBoii - display text, and platform frame rate	2017-05-30 17:42:23 -05:00
Subtitle.cs	Misc cleanups in Client.Common	2017-05-19 13:17:07 -05:00
SubtitleList.cs	more misc Client.Common cleanups	2017-05-17 13:18:26 -05:00