Context Navigation

Makefile.in

Timestamp:

Jan 11, 2015, 2:11:14 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/dvodist

Files:

Property svn:mergeinfo set to

/branches/eam_branches/ipp-20140423/dvodist	merged	eligible
/branches/eam_branches/ipp-20140610/dvodist	merged	eligible
/branches/eam_branches/ipp-20140717/dvodist	merged	eligible
/branches/eam_branches/ipp-20140813/dvodist	merged	eligible
/branches/eam_branches/ipp-20140904/dvodist	merged	eligible
/branches/eam_branches/ipp-ops-20130712/dvodist	merged	eligible
/tags/ipp-20130712/dvodist	merged	eligible

-              r37764
+              r37805
 include $(SRC-DVODIST)/3pi.20140713/Makefile
 include $(SRC-DVODIST)/LAP.3pi.PV1/Makefile
+include $(SRC-DVODIST)/lap.pv2.20141215/Makefile
 include $(SRC-DVODIST)/3pi.20120525.tables/Makefile
 include $(SRC-DVODIST)/3pi.20130227.tables/Makefile
 …
 $(DIST-3pi-20140713) \
 $(DIST-LAP-3pi-PV1) \
+$(DIST-lap-pv2-20141215) \
 $(DIST-3pi-20120525-tables) \
 $(DIST-3pi-20130227-tables) \

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