]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06a03bb 58f4bf4)
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Sat, 3 May 2014 00:51:02 +0000 (02:51 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sat, 3 May 2014 00:51:02 +0000 (02:51 +0200)
* PHP-5.5:
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.