- Timestamp:
- Oct 7, 2015 3:19:00 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
- 1 copied
-
Config.kmk (modified) (1 diff)
-
src/libs/Makefile.kmk (modified) (1 diff)
-
src/libs/libpng-1.2.53 (modified) (1 prop)
-
src/libs/libpng-1.2.53/Makefile.kmk (copied) (copied from trunk/src/libs/libpng-1.2.8/Makefile.kmk )
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r58088 r58101 3185 3185 3186 3186 SDK_VBOX_LIBPNG = . 3187 SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2. 83187 SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.53 3188 3188 SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB) 3189 3189 -
trunk/src/libs/Makefile.kmk
r58087 r58101 34 34 # PNG support (for screenshots). 35 35 if !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_VALIDATIONKIT) \ 36 && "$(SDK_VBOX_LIBPNG_INCS)" == "$(PATH_ROOT)/src/libs/libpng-1.2. 8"37 include $(PATH_SUB_CURRENT)/libpng-1.2. 8/Makefile.kmk36 && "$(SDK_VBOX_LIBPNG_INCS)" == "$(PATH_ROOT)/src/libs/libpng-1.2.53" 37 include $(PATH_SUB_CURRENT)/libpng-1.2.53/Makefile.kmk 38 38 endif # !VBOX_ONLY_DOCS 39 39 -
trunk/src/libs/libpng-1.2.53
-
Property svn:mergeinfo
set to (toggle deleted branches)
/trunk/src/libs/libpng-1.2.8 merged eligible /branches/VBox-3.0/src/libs/libpng-1.2.53 58652,70973 /branches/VBox-3.2/src/libs/libpng-1.2.53 66309,66318 /branches/VBox-4.0/src/libs/libpng-1.2.53 70873 /branches/VBox-4.1/src/libs/libpng-1.2.53 74233,78414,78691,82579,85941,85944-85947,85949-85950,85953,86701,86728,87009 /branches/VBox-4.2/src/libs/libpng-1.2.53 82653,86229-86230,86234,86529,91503-91504,91506-91508,91510,91514-91515,91521 /branches/VBox-4.3/src/libs/libpng-1.2.53 89714,91223,94066,94839,94897,95154,95164,95167,95295,95338,95353-95354,95356,95367,95451,95475,95477,95480,95507,95640,95659,95661,95663,98913-98915,99358 /branches/VBox-4.3/trunk/src/libs/libpng-1.2.53 91223 /branches/andy/draganddrop/src/libs/libpng-1.2.53 90781-91268 /branches/andy/guestctrl20/src/libs/libpng-1.2.53 78916,78930 /branches/andy/pdmaudio/src/libs/libpng-1.2.53 94582,94641,94654,94688,94778,94783,94816,95197,95215-95216,95250,95279,95505-95506,95543,95694,96323,96470-96471,96582,96587,96802-96803,96817,96904,96967,96999,97020-97021,97025,97050,97099 /branches/bird/hardenedwindows/src/libs/libpng-1.2.53 92692-94610 /branches/dsen/gui/src/libs/libpng-1.2.53 79076-79078,79089,79109-79110,79112-79113,79127-79130,79134,79141,79151,79155,79157-79159,79193,79197 /branches/dsen/gui2/src/libs/libpng-1.2.53 79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644 /branches/dsen/gui3/src/libs/libpng-1.2.53 79645-79692 /trunk/src/src/libs/libpng-1.2.53 92342
-
Property svn:mergeinfo
set to (toggle deleted branches)
Note:
See TracChangeset
for help on using the changeset viewer.
