Context Navigation

Makefile

Timestamp:

Aug 23, 2012, 10:02:59 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120805/Ohana

Files:

Property svn:mergeinfo set to

r34260	r34341
31	31	mkcmf : $(BIN)/mkcmf.$(ARCH)
32	32
33		all: addstar addstar_client sedstar load2mass skycells mkcmf loadwise loadsupercos dumpskycells
	33	all: addstar addstar_client sedstar load2mass skycells mkcmf loadwise loadsupercos dumpskycells findskycell
34	34
35	35	INSTALL = addstar addstar_client sedstar load2mass skycells mkcmf loadwise loadsupercos dumpskycells findskycell

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

/branches/czw_branch/20101203/Ohana	merged	eligible
/branches/eam_branches/ipp-20101103/Ohana	merged	eligible
/branches/eam_branches/ipp-20101205/Ohana	merged	eligible
/branches/eam_branches/ipp-20110213/Ohana	merged	eligible
/branches/eam_branches/ipp-20110404/Ohana	merged	eligible
/branches/eam_branches/ipp-20110505/Ohana	merged	eligible
/branches/eam_branches/ipp-20110710/Ohana	merged	eligible
/branches/eam_branches/ipp-20110906/Ohana	merged	eligible
/branches/eam_branches/ipp-20111110/Ohana	merged	eligible
/branches/eam_branches/ipp-20120405/Ohana	merged	eligible
/branches/eam_branches/ipp-20120601/Ohana	merged	eligible
/branches/eam_branches/ipp-20120627/Ohana	merged	eligible
/branches/haf_add201112/Ohana	merged	eligible
/trunk/Ohana	merged	eligible