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
..
RamPoke.Designer.cs	Poke: Ram -> RAM #669	2016-07-22 01:52:43 +09:30
RamPoke.cs	Merge branch 'master' into mono-portable	2017-05-23 20:32:48 -05:00
RamPoke.resx	fix some weirdly bloated dialog box resx files simply by deleting their icons and re-setting them	2015-10-13 00:14:12 -05:00
RamSearch.Designer.cs	Ram Search - Better event to tie toolbar enabling logic to for indices changing - fixes #629	2016-09-21 14:31:42 -04:00
RamSearch.cs	heh	2017-05-10 07:45:23 -04:00
RamSearch.resx	Ram Search - Issue 342 - add an "Account for lag" option to the auto-search feature, on by default because I decided that you probably really want that most of the time and don't realize that you do	2015-01-02 21:53:39 +00:00
RamWatch.Designer.cs	Tools: Ram -> RAM #669	2016-07-22 01:32:54 +09:30
RamWatch.cs	heh	2017-05-10 07:45:23 -04:00
RamWatch.resx	Fix Ram Watch designer file	2015-02-08 22:30:18 +00:00
WatchEditor.Designer.cs	replace "Ok" with "OK"	2016-03-26 21:50:33 -05:00
WatchEditor.cs	Merge branch 'master' into mono-portable	2017-05-23 20:32:48 -05:00
WatchEditor.resx	Rename Multiclient folder	2013-11-03 04:05:56 +00:00
WatchValueBox.cs	heh	2017-05-10 07:45:23 -04:00