Context Navigation

Changeset 37930 for trunk

Timestamp:

Feb 24, 2015, 7:04:45 AM (11 years ago)

Author:

eugene

Message:

merge changes (mergeinfo and ignores)

Location:

trunk

Files:

Property svn:mergeinfo changed

/branches/eam_branches/ipp-pv3-20140717-merge (added)	merged: 37819-37832
/tags/ipp-pv3-20140717 (added)	merged: 37057,37082,37088,37103,37105,37119,37124,37126,37144,37146-37147,37149-37150,37153,37155,37188,37194,37196,37203,37255,37258,37262-37273,37275-37278,37280-37289,37291-37304,37314,37316-37317,37320,37322-37324,37328-37333,37335-37343,37345-37347,37349,37352,37366,37370-37374,37382,37388,37391,37393,37440-37442,37483,37487-37488,37492,37535,37543-37544,37559,37599,37670-37671,37726,37737,37756,37761,37768,37782-37783,37788

Property svn:mergeinfo set to

/branches/eam_branches/ipp-20140423/Nebulous/bin/neb-rm	merged	eligible
/branches/eam_branches/ipp-20140610/Nebulous/bin/neb-rm	merged	eligible
/branches/eam_branches/ipp-ops-20130712/Nebulous/bin/neb-rm	merged	eligible
/branches/eam_branches/ipp-pv3-20140717-merge/Nebulous/bin/neb-rm	merged	eligible
/tags/ipp-20130712/Nebulous/bin/neb-rm	merged	eligible
/tags/ipp-pv3-20140717/Nebulous/bin/neb-rm	merged	eligible

Property svn:mergeinfo changed

/branches/eam_branches/ipp-pv3-20140717-merge/dvodist (added)	merged: 37821,37832
/branches/eam_branches/ipp-20140717/dvodist	removed
/branches/eam_branches/ipp-20140813/dvodist	removed
/branches/eam_branches/ipp-20140904/dvodist	removed
/tags/ipp-20141224/dvodist	removed

Property svn:ignore

-              old
+              new
 cfitsio3100-p4
 cfitsio3100-pap
+cfitsio3100-p5
 fftw-3.0.1
 gsl-1.11
 …
 readline-5.2-p14
 zlib-1.2.3

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