summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-07-211-0/+4
|\
| * Enable $ replacement in exif, ldap, pdo_pgsql and tidyLior Kaplan2014-07-211-0/+4
* | Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALSNikita Popov2013-03-231-0/+2
|/
* Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-08-111-0/+1
|\
| * Fixed bug #62795 (Zip extension version not defined)Xinchen Hui2012-08-111-0/+1
* | Merge .gitattributes EOL commit from 5.3.Gustavo André dos Santos Lopes2012-04-101-0/+150
|\ \ | |/
| * Disabled EOL conversions on certain testsGustavo André dos Santos Lopes2012-04-101-0/+149
|/
* Use the NEWS merge driver if availableDavid Soria Parra2012-03-211-1/+1
* Always keep the NEWS file from the branch when mergingDavid Soria Parra2012-03-211-0/+1
* Enable $Id$ expansion for files with the $Revision$ keywordDavid Soria Parra2012-03-201-0/+23