Context Navigation

disttool.h

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111122/ippTools/src

Files:

Property svn:ignore

Property svn:mergeinfo changed

/branches/haf_add201112/ippTools/src (added)	merged: 32980,32986,33003,33023,33027
/trunk/ippTools/src	merged: 32942-32943,32960,32962,32975,33030-33031,33042-33043,33109,33111-33112,33119,33331-33337,33343,33384-33385,33525,33533,33617,33619,33625

-              r28938
+              r33638
     DISTTOOL_MODE_UPDATERUN,
     DISTTOOL_MODE_REVERTRUN,
     DISTTOOL_MODE_RERUN,
+    DISTTOOL_MODE_STARTOVER,
     DISTTOOL_MODE_PENDINGCOMPONENT,
     DISTTOOL_MODE_ADDPROCESSEDCOMPONENT,
     DISTTOOL_MODE_REVERTCOMPONENT,
     DISTTOOL_MODE_PROCESSEDCOMPONENT,
+    DISTTOOL_MODE_UPDATEPROCESSEDCOMPONENT,
     DISTTOOL_MODE_TOADVANCE,
     DISTTOOL_MODE_PENDINGCLEANUP,

Note: See TracChangeset for help on using the changeset viewer.