diff options
author | Remi Collet <remi@php.net> | 2014-06-05 17:45:41 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2014-06-05 17:45:41 +0200 |
commit | e31b51f9a0e5beadb250c67a0865539b3e9fb222 (patch) | |
tree | 7dd1acec89a436d1828b3249d6108d9900aa9053 | |
parent | 67f1a58ac9cc42b3bcd077aad246d300b07a7010 (diff) | |
parent | 56c9e22c1f4b860a1c0e76314fa97cc85626eb05 (diff) | |
download | php-git-e31b51f9a0e5beadb250c67a0865539b3e9fb222.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
drop exec perm on doc files
-rw-r--r--[-rwxr-xr-x] | README.namespaces | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | UPGRADING | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/README.namespaces b/README.namespaces index 9c427b634f..9c427b634f 100755..100644 --- a/README.namespaces +++ b/README.namespaces |