Context Navigation

Makefile

Timestamp:

Jun 27, 2018, 3:20:35 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/Ohana

Files:

Property svn:mergeinfo changed

/branches/eam_branches/ohana.20170822 (added)	merged: 40122-40125,40141-40146,40155-40156,40158-40159,40163-40164,40168-40177,40202,40209-40214,40216-40217,40219-40220,40223,40228-40231,40234-40239,40243-40249,40253-40260,40262-40263,40265-40267,40285-40286,40289
/trunk/Ohana (added)	merged: 40165,40291,40295-40296,40308,40313,40315-40320,40322-40323,40325,40328-40336,40342,40371,40373,40376-40378,40382-40386,40397-40398,40400-40402,40405-40411,40414-40415,40418-40420,40424,40436,40463-40464,40469,40471

-              r40063
+              r40477
 $(DESTINC)/ps1_v4_defs.h \
 $(DESTINC)/ps1_v5_defs.h \
+$(DESTINC)/ps1_v6_defs.h \
 $(DESTINC)/ps1_v5_ld_defs.h \
 $(DESTINC)/ps1_ref_defs.h \
 …
 $(SRC)/dvo_convert_PS1_V4.$(ARCH).o \
 $(SRC)/dvo_convert_PS1_V5.$(ARCH).o \
+$(SRC)/dvo_convert_PS1_V6.$(ARCH).o \
 $(SRC)/dvo_convert_PS1_V5_LOAD.$(ARCH).o \
 $(SRC)/dvo_convert_PS1_REF.$(ARCH).o \

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