[mapguide-commits] r8799 - sandbox/jng/diet_vs2015/Oem/php

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-10-29 04:23:13 -0700 (Thu, 29 Oct 2015)
New Revision: 8799

Added:
   sandbox/jng/diet_vs2015/Oem/php/Zend/
Modified:
   sandbox/jng/diet_vs2015/Oem/php/
Log:
Merged revision(s) 8797 from trunk/MgDev/Oem:
Add modified zend_config.w32.h to Oem/php folder, it will be used to override official php-x.y.z before build. 
........



Property changes on: sandbox/jng/diet_vs2015/Oem/php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev/Oem/php:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev/Oem/php:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev/Oem/php:8705,8710
/sandbox/VC140/Oem/php:8684-8759
/sandbox/adsk/2.6l/Oem/php:8727
/sandbox/adsk/3.0m/Oem/php:8563,8584,8607,8625,8694-8695
/sandbox/jng/convenience_apis/Oem/php:8262-8268,8271-8363
/sandbox/jng/createruntimemap/Oem/php:7486-7555
/sandbox/jng/dwftk/Oem/php:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x/Oem/php:8256-8259
/sandbox/jng/tiling/Oem/php:8174-8208
/sandbox/jng/v30/Oem/php:8212-8227
/sandbox/rfc94/Oem/php:5099-5163
   + /branches/2.4/MgDev/Oem/php:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev/Oem/php:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev/Oem/php:8705,8710
/sandbox/VC140/Oem/php:8684-8759
/sandbox/adsk/2.6l/Oem/php:8727
/sandbox/adsk/3.0m/Oem/php:8563,8584,8607,8625,8694-8695
/sandbox/jng/convenience_apis/Oem/php:8262-8268,8271-8363
/sandbox/jng/createruntimemap/Oem/php:7486-7555
/sandbox/jng/dwftk/Oem/php:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x/Oem/php:8256-8259
/sandbox/jng/tiling/Oem/php:8174-8208
/sandbox/jng/v30/Oem/php:8212-8227
/sandbox/rfc94/Oem/php:5099-5163
/trunk/MgDev/Oem/php:8797