Context Navigation

← Previous Change
Next Change →

dvo.photcodes

Timestamp:

Jul 17, 2014, 12:29:35 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/ippconfig

Files:

: 2 edited

. (modified) (1 prop)
dvo.photcodes (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/eam_branches/ipp-ops-20130712/ippconfig

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20140206/ippconfig (added)	merged: 36536,36627
/branches/eam_branches/ipp-20140214/ippconfig (added)	merged: 36525-36527
/branches/eam_branches/ipp-20140226/ippconfig (added)	merged: 36622
/branches/eam_branches/ipp-20140402/ippconfig (added)	merged: 36644,36677
/branches/eam_branches/ipp-20140423/ippconfig (added)	merged: 36765,36770,36820,36830,36832
/branches/eam_branches/ipp-20140610/ippconfig (added)	merged: 36884,36923,36928,37027,37029
/tags/ipp-20140114/ippconfig (added)	merged: 36446,36448,36546,36587
/branches/czw_branch/20100427/ippconfig	removed
/branches/czw_branch/20100519/ippconfig	removed
/branches/czw_branch/20100817/ippconfig	removed
/branches/czw_branch/20101203/ippconfig	removed
/branches/czw_branch/20120906/ippconfig	removed
/branches/eam_branches/ipp-20100823/ippconfig	removed
/branches/eam_branches/ipp-20101103/ippconfig	removed
/branches/eam_branches/ipp-20101205/ippconfig	removed
/branches/eam_branches/ipp-20110213/ippconfig	removed
/branches/eam_branches/ipp-20110404/ippconfig	removed
/branches/eam_branches/ipp-20110505/ippconfig	removed
/branches/eam_branches/ipp-20110710/ippconfig	removed
/branches/eam_branches/ipp-20110906/ippconfig	removed
/branches/eam_branches/ipp-20111110/ippconfig	removed
/branches/eam_branches/ipp-20111122/ippconfig	removed
/branches/eam_branches/ipp-20120405/ippconfig	removed
/branches/eam_branches/ipp-20120601/ippconfig	removed
/branches/eam_branches/ipp-20120627/ippconfig	removed
/branches/eam_branches/ipp-20120805/ippconfig	removed
/branches/eam_branches/ipp-20120905/ippconfig	removed
/branches/eam_branches/ipp-20121130/ippconfig	removed
/branches/eam_branches/ipp-20121219/ippconfig	removed
/branches/eam_branches/ipp-20130207/ippconfig	removed
/branches/eam_branches/ipp-20130307/ippconfig	removed
/branches/eam_branches/ipp-20130419/ippconfig	removed
/branches/eam_branches/ipp-20130509/ippconfig	removed
/branches/haf_add201112/ippconfig	removed
/branches/haf_branches/haf_add2011/ippconfig	removed
/branches/haf_branches/ipp.20100512/ippconfig	removed
/branches/pap/ippconfig	removed
/tags/ipp-20101029/ippconfig	removed

branches/eam_branches/ipp-ops-20130712/ippconfig/dvo.photcodes

-              r35562
+              r37065
 GPC1.y.SkyChip       dep  25.000  0.000 0.000     -     - 0.0000     0     5   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
 GPC1.w.SkyChip       dep  25.000  0.000 0.000     -     - 0.0000     0     9   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+GPC1.g.ForcedWarp    dep  25.000  0.000 0.000     -     - 0.0000     0     1   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+GPC1.r.ForcedWarp    dep  25.000  0.000 0.000     -     - 0.0000     0     2   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+GPC1.i.ForcedWarp    dep  25.000  0.000 0.000     -     - 0.0000     0     3   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+GPC1.z.ForcedWarp    dep  25.000  0.000 0.000     -     - 0.0000     0     4   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+GPC1.y.ForcedWarp    dep  25.000  0.000 0.000     -     - 0.0000     0     5   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+GPC1.w.ForcedWarp    dep  25.000  0.000 0.000     -     - 0.0000     0     9   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
    MOSAIC2.B.00         dep  25.107  0.000 0.000     -     - 0.0000     0     1   0.000 0.000 1.000  0.000   0x0000 0x3888  0x0000 0x0000
    MOSAIC2.B.01         dep  25.120  0.000 0.000     -     - 0.0000     0     1   0.000 0.000 1.000  0.000   0x0000 0x3888  0x0000 0x0000

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

Context Navigation

Changeset 37065 for branches/eam_branches/ipp-ops-20130712/ippconfig/dvo.photcodes

Legend:

branches/eam_branches/ipp-ops-20130712/ippconfig

branches/eam_branches/ipp-ops-20130712/ippconfig/dvo.photcodes

Download in other formats: