Hathor86
|
5c36c16160
|
Fixing merge
|
2015-11-08 22:57:54 +01:00 |
|
Hathor86
|
cc2c888870
|
Merge remote-tracking branch 'refs/remotes/TASVideos/master'
Conflicts:
BizHawk.Client.EmuHawk/MainForm.Designer.cs
BizHawk.Client.EmuHawk/MainForm.cs
BizHawk.Client.EmuHawk/tools/CDL.Designer.cs
BizHawk.Client.EmuHawk/tools/CDL.cs
BizHawk.Client.EmuHawk/tools/CDL.resx
BizHawk.Common/InstanceDll.cs
BizHawk.Emulation.Common/CodeDataLog.cs
|
2015-11-08 22:41:51 +01:00 |
|
zeromus
|
c68fdc511b
|
CDL - fix snes games with no cartram
|
2015-11-03 23:59:42 -06:00 |
|
zeromus
|
f3626b9605
|
snes CDL
|
2015-11-03 23:45:57 -06:00 |
|
Hathor86
|
f70a2c8c6c
|
Merge from TASVideo
|
2015-11-01 22:01:19 +01:00 |
|
zeromus
|
1ce0437c3d
|
CDL - add .cdl file map to dialogbox display
|
2015-11-01 11:23:33 -06:00 |
|
zeromus
|
70e0954f28
|
CDL - major refactor complete. muuuuch better.
|
2015-10-28 03:51:53 -05:00 |