summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2013-03-03 19:22:35 +0100
committerAnatol Belski <ab@php.net>2013-03-03 19:22:35 +0100
commitd95faef1a10df8db5ce622d6495733495d562430 (patch)
treedde599defc846bff811e054d0f9924582269d281
parent00ecc12c0fb86f3f4c03d55e1ae0fe1e417acea6 (diff)
parent6c2564766f9260ceecf3f963ce79a150cea9b0ac (diff)
downloadphp-git-d95faef1a10df8db5ce622d6495733495d562430.tar.gz
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files. Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
-rw-r--r--NEWS-5.4 (renamed from NEWS)0
1 files changed, 0 insertions, 0 deletions
diff --git a/NEWS b/NEWS-5.4
index 36f6f9a439..36f6f9a439 100644
--- a/NEWS
+++ b/NEWS-5.4