diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-07-21 01:47:19 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-07-21 01:47:19 +0300 |
| commit | 842fde2827394e68b3ddde0cee6462a3b19d63f9 (patch) | |
| tree | 0abd8fb9aaa349804cf05a613251591449eaf66f /.gitattributes | |
| parent | 658f7d77f9eb447ecc2f9812d46b4c07bb99b16d (diff) | |
| parent | 0678dc8d912435d27b1c5c00634c1db2b6581ab0 (diff) | |
| download | php-git-842fde2827394e68b3ddde0cee6462a3b19d63f9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Enable $ replacement in exif, ldap, pdo_pgsql and tidy
Update NEWS
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 79b218fcba..091043a35b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,6 +22,10 @@ sapi/nsapi/nsapi.c ident 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 |