com php-src: Merge branch 'PHP-5.4' into PHP-5.5: .gitattributes
| From: | Lior Kaplan | Date: | Sun, 20 Jul 2014 22:47:19 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: .gitattributes | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79535@lists.php.net to get a copy of this message | ||
Commit: 842fde2827394e68b3ddde0cee6462a3b19d63f9
Author: Lior Kaplan <kaplanlior@gmail.com> Mon, 21 Jul 2014 01:47:19 +0300
Parents: 658f7d77f9eb447ecc2f9812d46b4c07bb99b16d 0678dc8d912435d27b1c5c00634c1db2b6581ab0
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=842fde2827394e68b3ddde0cee6462a3b19d63f9
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Enable $ replacement in exif, ldap, pdo_pgsql and tidy
Update NEWS
Changed paths:
MM .gitattributes
Diff:
diff --cc .gitattributes
index 79b218f,a44aa5d..091043a
--- a/.gitattributes
+++ b/.gitattributes
@@@ -22,9 -22,11 +22,13 @@@ sapi/nsapi/nsapi.c iden
sapi/continuity/capi.c ident
Zend/RFCs/002.txt ident
Zend/RFCs/003.txt ident
+ ext/exif/exif.c ident
+ ext/ldap/ldap.c ident
+ ext/pdo_pgsql/pdo_pgsql..c ident
+ ext/tidy/tidy.c ident
NEWS merge=NEWS
+UPGRADING merge=NEWS
+UPGRADING.INTERNALS merge=NEWS
/ext/bz2/tests/with_strings.phpt -crlf
/ext/dom/tests/bug40836.phpt -crlf
/ext/dom/tests/domelement.phpt -crlf