summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2013-03-03 19:23:06 +0100
committerAnatol Belski <ab@php.net>2013-03-03 19:23:06 +0100
commita5b6a0a25bf6c7432a585b317ae89399c6fd42a9 (patch)
treec4e6f40a7fbaad22701fb95c20a2455b7f45f886
parent555d584a408aac06321f1e022a208aa249fce999 (diff)
parent1e1de1554f2fb78f9d8fc237e52e42d276a64b6e (diff)
downloadphp-git-a5b6a0a25bf6c7432a585b317ae89399c6fd42a9.tar.gz
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' 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. Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
-rw-r--r--NEWS-5.5 (renamed from NEWS)0
1 files changed, 0 insertions, 0 deletions
diff --git a/NEWS b/NEWS-5.5
index a5b11c0d32..a5b11c0d32 100644
--- a/NEWS
+++ b/NEWS-5.5