Sappharad
|
4fd45964c0
|
Merge branch 'master' into mono-portable
Hopefully I didn't botch this, I'm not good at how git handles conflicts yet.
|
2015-10-12 21:34:13 -05:00 |
|
zeromus
|
a3ff5b0d8c
|
improve discohawk reliability
|
2015-09-10 16:54:02 -05:00 |
|
Sappharad
|
74d7bf32b6
|
Merge branch 'master' into mono-portable
Conflicts:
.gitignore
Version/version.csproj
|
2015-07-15 21:42:53 -05:00 |
|
zeromus
|
bdb64ce251
|
clarify disc ID process comments a bit
|
2015-07-11 13:47:00 -05:00 |
|
zeromus
|
41d5875baf
|
big discsys reorg.. move all API parts into Disc*-named files in root and hide more private stuff
|
2015-07-11 13:46:58 -05:00 |