Changeset 33030 for trunk/ippTools/src/mergetool.c

Timestamp:

Dec 27, 2011, 3:09:17 PM (14 years ago)

Author:

heather

Message:

crap. I don't know why it thinks some of these are modified, but diffing them
against a fresh checkout of the trunk shows no differences.

These are the merge of addstar changes into the trunk. This adds tables,
breaking apart minidvodbRun into 2 parts (building/relphot/addstar) and
(verify/merging), which will make it easier to rebuild dvodbs in the
future. There's some debugging of various tasks here (addstar.revert, for
example), and a lot of cleanup of code.

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (2 props)
• ippTools/src/mergetool.c (copied) (copied from branches/haf_add201112/ippTools/src/mergetool.c )

trunk/ippTools/src

@@ -7 +7 @@
 Makefile.in
 addtool
+mergetool
 caltool
 camtool

@@ -7 +7 @@
 Makefile.in
 addtool
+mergetool
 caltool
 camtool

@@ -7 +7 @@
 Makefile.in
 addtool
+mergetool
 caltool
 camtool