]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1dcb81c c918ca5)
Merge branch 'PHP-5.4'
authorDavid Soria Parra <dsp@php.net>
Tue, 20 Mar 2012 16:59:33 +0000 (17:59 +0100)
committerDavid Soria Parra <dsp@php.net>
Tue, 20 Mar 2012 16:59:33 +0000 (17:59 +0100)
commit6e7284fb5be77bcbb26ea1934350e902b195a1c1
tree4624767035f413021118c7cd0d3fcec58a0e6365tree | snapshot
parent1dcb81c14c41142b41b2c18fd7fc3acbceb6e3cdcommit | diff
parentc918ca57a7233206ec78ac00438eeb6830e3680bcommit | diff
Merge branch 'PHP-5.4'

* PHP-5.4:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
ext/mysqlnd/mysqlnd.h
ext/mysqlnd/mysqlnd.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.