Context Navigation

dvodb.h

Timestamp:

Jul 24, 2014, 5:10:56 PM (12 years ago)

Author:

eugene

Message:

merge relphot changes from eam_branches/ipp-20140717

Location:

trunk/Ohana

Files:

Property svn:mergeinfo set to

/branches/eam_branches/ipp-20140423/Ohana	merged	eligible
/branches/eam_branches/ipp-20140610/Ohana	merged	eligible
/branches/eam_branches/ipp-20140717/Ohana	merged	eligible
/branches/eam_branches/ipp-ops-20130712/Ohana	merged	eligible
/tags/ipp-20130712/Ohana	merged	eligible
/trunk/Ohana	merged	eligible

-              r37035
+              r37116
   MAG_OPTION_NPHOT, // Nused
   MAG_OPTION_UC_DIST,
-  MAG_OPTION_STACK_DET_ID,
   MAG_OPTION_FLAGS,
 } dvoMagOptionType;
+//  MAG_OPTION_STACK_PRIMARY_OFF,
+//  MAG_OPTION_STACK_BEST_OFF,
 typedef enum {

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