Changeset 31147
- Timestamp:
- Apr 4, 2011, 11:10:00 AM (15 years ago)
- Location:
- branches/eam_branches/ipp-20110213
- Files:
-
- 6 edited
-
. (modified) (1 prop)
-
Ohana/src/dvomerge (modified) (1 prop)
-
ippconfig (modified) (1 prop)
-
ippconfig/recipes/nightly_science.config (modified) (1 diff)
-
ppImage/src (modified) (1 prop)
-
psphot (modified) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-20110213
- Property svn:mergeinfo changed
/trunk merged: 31096-31097,31101-31102,31104-31110,31112-31120,31122-31142
- Property svn:mergeinfo changed
-
branches/eam_branches/ipp-20110213/Ohana/src/dvomerge
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/eam_branches/ipp-20110213/ippconfig
- Property svn:mergeinfo changed
/trunk/ippconfig merged: 31110
- Property svn:mergeinfo changed
-
branches/eam_branches/ipp-20110213/ippconfig/recipes/nightly_science.config
r31094 r31147 252 252 DIFF S16 12 253 253 END 254 TARGETS METADATA 255 NAME STR microtest 256 TESS STR RINGS.V0 257 COMMENT STR Microtest Obs% 258 STACKABLE BOOL FALSE 259 DIFFABLE BOOL FALSE 260 DISTRIBUTION STR NODIST 261 END 262 254 263 # This is a hack, and I freely admit it. 255 264 # Removed the rest because we do not regularly run microtests. -
branches/eam_branches/ipp-20110213/ppImage/src
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/eam_branches/ipp-20110213/psphot
- Property svn:mergeinfo changed (with no actual effect on merging)
Note:
See TracChangeset
for help on using the changeset viewer.
