Context Navigation

Makefile

Timestamp:

Mar 29, 2015, 6:52:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from ipp-20150112

Location:

trunk

Files:

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20150112 (added)	merged: 37839,37848-37859,37866,37869,37876-37877,37901,37908,37910-37913,37933,37944,37946,37951-37952,37954-37958,37963,37977-37979,38044-38061
/branches/eam_branches/ipp-20140423	removed
/branches/eam_branches/ipp-20140610	removed
/branches/eam_branches/ipp-20140717	removed
/branches/eam_branches/ipp-20140813	removed
/branches/eam_branches/ipp-20140904	removed
/branches/eam_branches/ipp-20150326	removed
/branches/eam_branches/ipp-ops-20130712	removed
/branches/eam_branches/ipp-pv3-20140717-merge	removed
/branches/eam_branches/ps2-tc3-20130727	removed
/tags/ipp-20130712	removed
/tags/ipp-20141119	removed
/tags/ipp-20141224	removed
/tags/ipp-pv3-20140717	removed

-              r37037
+              r38062
 $(SRC)/relphot_parallel_regions.$(ARCH).o \
 $(SRC)/relphot_parallel_images.$(ARCH).o \
+$(SRC)/relphot_synthphot.$(ARCH).o       \
+$(SRC)/relphot_synthphot_catalog.$(ARCH).o       \
+$(SRC)/synthetic_zpts.$(ARCH).o  \
 $(SRC)/select_images.$(ARCH).o   \
 $(SRC)/assign_images.$(ARCH).o   \
 …
 $(SRC)/relphot_objects.$(ARCH).o         \
 $(SRC)/relphot_client.$(ARCH).o  \
+$(SRC)/relphot_synthphot.$(ARCH).o       \
+$(SRC)/relphot_synthphot_catalog.$(ARCH).o       \
+$(SRC)/synthetic_zpts.$(ARCH).o  \
 $(SRC)/client_logger.$(ARCH).o   \
 $(SRC)/setExclusions.$(ARCH).o   \

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