]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 144f2f1 160cd8d)
Merge branch 'PHP-5.4' into PHP-5.5
authorAdam Harvey <aharvey@php.net>
Mon, 9 Sep 2013 23:58:35 +0000 (16:58 -0700)
committerAdam Harvey <aharvey@php.net>
Mon, 9 Sep 2013 23:58:35 +0000 (16:58 -0700)
* PHP-5.4:
  Tinker with the wording of the short_open_tag description.

1  2 
php.ini-development patch | diff1 | diff2 | blob | history
php.ini-production patch | diff1 | diff2 | blob | history

diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
Unnamed repository; edit this file 'description' to name the repository.