tomch
5e33fa0f2c
Manual merge from cm630 to trunk (ie. I didn't use svn to merge)
2009-01-09 21:59:22 +00:00
tomch
176eb76e55
Rollback to r413, as the merge from cm630 included many files that hadn't changed.
...
From TortoiseSVN:
. Revision range to merge: 416-HEAD
. [x] Reverse merge
Does a reverse merge on r417-r416
2009-01-06 22:02:31 +00:00
tomch
07bd49468d
Merge from cm630: r326 through r416
2009-01-05 22:59:26 +00:00
mpohoreski
150e6f0f7a
using new enum for IO slot size
2008-09-04 16:41:17 +00:00
tomch
a1debc40e4
Merge from Tom branch to trunk
...
. SSC now working: PR#2 & IN#2
. etc.
2007-05-28 11:16:42 +00:00
nick_westgate
3b043604b0
Updated AppleWin (not TFE etc) copyright dates from "2006" to "2006-2007".
2007-04-01 15:24:52 +00:00
nick_westgate
232c78240f
Added Log.h to the project.
...
Fixed warning in Debugger_Display.cpp.
Changed printing timeout to 10 seconds. (No rush to type PR#0!)
Added SVN ignores for Release, Debug, *.user, *.ncb, *.suo.
2007-03-24 04:24:17 +00:00
tomch
26a45bc17e
Merged from sicklittlemonkey branch to trunk
...
(rev 111-HEAD)
2007-03-23 22:26:35 +00:00