]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Thu, 5 Jun 2014 15:45:41 +0000 (17:45 +0200)
committerRemi Collet <remi@php.net>
Thu, 5 Jun 2014 15:45:41 +0000 (17:45 +0200)
* PHP-5.4:
  drop exec perm on doc files

1  2 
UPGRADING

diff --cc UPGRADING
index 510abcc7b6ca7becb23a4068850654a20f11f02d,74f59e613625ca93d94e85badae863bb0bc75c06..510abcc7b6ca7becb23a4068850654a20f11f02d
mode 100755,100644..100644
+++ b/UPGRADING