Context Navigation

Makefile

Timestamp:

Nov 27, 2019, 11:39:38 AM (7 years ago)

Author:

eugene

Message:

merge changes from trunk (mostly Ohana & ippMonitor improvements, some work on ippTools)

Location:

branches/eam_branches/ipp-20191011

Files:

Property svn:mergeinfo changed

/branches/IPP-308_move_backups_folder (added)	merged: 40969-40970
/branches/ipp-259_genericise_backups (added)	merged: 40910-40913,40915,40919-40924,40931-40932,40937,40944-40945,40949-40952,40958-40959,40962-40963,40966
/trunk (added)	merged: 40936,40967,40971-40973,41067,41071-41072,41125-41129,41132-41135,41145,41151-41166

Property svn:mergeinfo changed

/branches/eam_branches/ohana.20190329 (added)	merged: 40660-40665,40691,40704,40707,40730-40734,40736,40740-40741,40750-40755,40758,40770-40784,40791-40792,40811-40817,40820-40822,40830,40832-40833,40836-40839,40863-40871,40880-40881,40886-40890,40902-40903,40905,40925-40929,40943,41146-41150
/trunk/Ohana (added)	merged: 41151-41166

r39401	r41170
42	42	$(SRC)/bDrawObjects.$(ARCH).o $(SRC)/bDrawFrame.$(ARCH).o \
43	43	$(SRC)/bDrawLabels.$(ARCH).o $(SRC)/bDrawIt.$(ARCH).o \
44		$(SRC)/bDrawImage.$(ARCH).o \
	44	$(SRC)/bDrawImage.$(ARCH).o $(SRC)/MemoryDump.$(ARCH).o \
45	45	$(SRC)/PNGit.$(ARCH).o $(SRC)/PPMit.$(ARCH).o \
46	46	$(SRC)/PSit.$(ARCH).o $(SRC)/CrossHairs.$(ARCH).o \

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