com php-src: Merge branch 'PHP-5.5' into PHP-5.6: UPGRADING
| From: | Remi Collet | Date: | Thu, 05 Jun 2014 15:45:59 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: UPGRADING | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78708@lists.php.net to get a copy of this message | ||
Commit: 6a5d5d1db43e670427f83760afbdec3b28eab3d0
Author: Remi Collet <remi@php.net> Thu, 5 Jun 2014 17:45:59 +0200
Parents: b16950b5d32df8cc885f5b46c752ddf5c4f48c0d e31b51f9a0e5beadb250c67a0865539b3e9fb222
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6a5d5d1db43e670427f83760afbdec3b28eab3d0
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
drop exec perm on doc files
Changed paths:
MM UPGRADING
Diff:
diff --cc UPGRADING
index 7a174c4,510abcc..7a174c4
mode 100755,100644..100644
--- a/UPGRADING
+++ b/UPGRADING