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