Commit Graph

3 Commits

Author SHA1 Message Date
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