Sappharad 5573409fad Merge branch 'master' into mono-portable ... # Conflicts: # BizHawk.Client.Common/Extensions.cs # BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs # BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj # BizHawk.Client.EmuHawk/MainForm.Events.cs # BizHawk.Client.EmuHawk/MainForm.cs # BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs # BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs # BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs # BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs # libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp		2017-05-23 20:32:48 -05:00
..
EditCommentsForm.Designer.cs	misc code formatting improvements in random files in EmuHawk	2017-04-17 15:23:31 -05:00
EditCommentsForm.cs	heh	2017-05-10 07:45:23 -04:00
EditCommentsForm.resx	Rename Multiclient folder	2013-11-03 04:05:56 +00:00
EditSubtitlesForm.Designer.cs	misc code formatting improvements in random files in EmuHawk	2017-04-17 15:23:31 -05:00
EditSubtitlesForm.cs	Merge branch 'master' into mono-portable	2017-05-02 20:38:56 -05:00
EditSubtitlesForm.resx	Rename Multiclient folder	2013-11-03 04:05:56 +00:00
MovieDetails.cs	heh	2017-05-10 07:45:23 -04:00
PlayMovie.Designer.cs	replace "Ok" with "OK"	2016-03-26 21:50:33 -05:00
PlayMovie.cs	Merge branch 'master' into mono-portable	2017-05-23 20:32:48 -05:00
PlayMovie.resx	Play Movie - add an Edit context menu item	2014-04-22 00:59:21 +00:00
RecordMovie.Designer.cs	replace "Ok" with "OK"	2016-03-26 21:50:33 -05:00
RecordMovie.cs	Merge branch 'master' into mono-portable	2017-05-02 20:38:56 -05:00
RecordMovie.resx	Rename Multiclient folder	2013-11-03 04:05:56 +00:00
SubtitleMaker.Designer.cs	misc code formatting improvements in random files in EmuHawk	2017-04-17 15:23:31 -05:00
SubtitleMaker.cs	misc code formatting improvements in random files in EmuHawk	2017-04-17 15:23:31 -05:00
SubtitleMaker.resx	Rename Multiclient folder	2013-11-03 04:05:56 +00:00