Hathor86
|
c7dcb42b94
|
Merge from maser@TASVideos
|
2015-11-15 11:27:00 +01:00 |
|
zeromus
|
5afa44bbec
|
common logic for tempfiles
|
2015-11-15 03:01:58 -06:00 |
|
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
|
cbdf6a2acc
|
after i fix a regression from a couple of commits ago which broke multi-instance dlls (affecting only bsnes otherwise right now)
|
2015-11-07 12:05:26 -06:00 |
|
zeromus
|
7651f418fe
|
usably functional libretro player
|
2015-11-07 00:14:59 -06:00 |
|
Hathor86
|
f70a2c8c6c
|
Merge from TASVideo
|
2015-11-01 22:01:19 +01:00 |
|
zeromus
|
18aeefb66a
|
add InstanceDll
|
2015-10-24 03:03:29 -05:00 |