Commit graph

4 commits

Author SHA1 Message Date
Paul Beckingham
87df2f66ec Merge
- Fixed merge, with an egregious hack for now, by creating zero-byte undo.data
  file.  This goes against the whole TDB2 philosophy, so it is temporary.
- Updated PUNCHLIST.
- Removed old tdb comment from CmdMerge.
2011-09-13 00:51:58 -04:00
Paul Beckingham
157dad0026 Unit Tests
- Fixed broken unit test.
- Updated PUNCHLIST.
- Clarified task counting in helpers.cpp.
2011-09-12 01:38:35 -04:00
Paul Beckingham
03e53ceaf2 Miscellaneous
- Minor edits of little consequence.
2011-09-11 23:06:51 -04:00
Paul Beckingham
c54bb8a42a Beta Punchlist
- Added beta punch list.  This will go away eventually.
2011-09-09 00:12:28 -04:00