]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 676f0de e9b978c)
Merge branch 'PHP-5.3' into PHP-5.4
authorDavid Soria Parra <dsp@php.net>
Fri, 13 Apr 2012 14:33:25 +0000 (16:33 +0200)
committerDavid Soria Parra <dsp@php.net>
Fri, 13 Apr 2012 14:33:25 +0000 (16:33 +0200)
commitde6dfe5bbd197e6387f0044b857b518e29e27283
tree527a2b6b692ed12292ce0c1a7bc8d03ed38265actree | snapshot
parent676f0deb38910bcc859924f871c284b73a9dd13dcommit | diff
parente9b978c374e0b8f2afd32ff07920f419fce4b9fbcommit | diff
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  configure.in: Check for README.GIT-RULES instead of README.SVN-RULES

Conflicts:
configure.in
configure.in diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.