Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS | Nikita Popov | 2013-03-23 | 1 | -0/+2 |
* | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-08-11 | 1 | -0/+1 |
|\ | |||||
| * | Fixed bug #62795 (Zip extension version not defined) | Xinchen Hui | 2012-08-11 | 1 | -0/+1 |
* | | Merge .gitattributes EOL commit from 5.3. | Gustavo André dos Santos Lopes | 2012-04-10 | 1 | -0/+150 |
|\ \ | |/ | |||||
| * | Disabled EOL conversions on certain tests | Gustavo André dos Santos Lopes | 2012-04-10 | 1 | -0/+149 |
|/ | |||||
* | Use the NEWS merge driver if available | David Soria Parra | 2012-03-21 | 1 | -1/+1 |
* | Always keep the NEWS file from the branch when merging | David Soria Parra | 2012-03-21 | 1 | -0/+1 |
* | Enable $Id$ expansion for files with the $Revision$ keyword | David Soria Parra | 2012-03-20 | 1 | -0/+23 |