Context Navigation

Makefile

Timestamp:

Jun 25, 2009, 2:00:56 PM (17 years ago)

Author:

eugene

Message:

merging changes from head

Location:

branches/eam_branches/20090522

Files:

Property svn:mergeinfo changed

/branches/pap_mops (added)	merged: 24221,24373,24375-24377,24392,24413,24416,24427-24430,24435-24439,24442-24452,24456-24457,24499,24501,24503-24505,24507,24509
/trunk (added)	merged: 24239-24242,24245-24308,24311-24372,24374,24378-24391,24393-24412,24414-24415,24417-24426,24431-24434,24440-24441,24453-24455,24458-24498,24500,24502,24506,24508,24510-24513,24515-24528,24530-24556

branches/eam_branches/20090522/Ohana
- Property svn:mergeinfo changed (with no actual effect on merging)

Property svn:mergeinfo set to (toggle deleted branches)

/branches/pap/Ohana/src/relastro	merged	eligible
/branches/cnb_branches/cnb_branch_20090301/Ohana/src/relastro	22723-24307
/branches/eam_branches/eam_branch_20090303/Ohana/src/relastro	23158-23228
/branches/eam_branches/eam_branch_20090322/Ohana/src/relastro	23482-23529
/branches/pap_magic/Ohana/src/relastro	24120-24173
/branches/pap_mops/Ohana/src/relastro	24221-24510

-              r17243
+              r24557
 $(SRC)/relastro_objects.$(ARCH).o    \
 $(SRC)/save_catalogs.$(ARCH).o       \
+$(SRC)/write_coords.$(ARCH).o
+$(SRC)/write_coords.$(ARCH).o        \
+$(SRC)/relastroVisual.$(ARCH).o
 $(RELASTRO): $(INC)/relastro.h $(KAPA_INCS)

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