]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a53d82d b52a294)
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Tue, 10 Mar 2015 16:32:38 +0000 (19:32 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 10 Mar 2015 16:32:38 +0000 (19:32 +0300)
commit5d0bacfe679d53ee1fd712c473e7e2cd51f24f6d
tree6a2679204fb45b16bd9cc6893ca4a900c8a5372atree | snapshot
parenta53d82daa6d8de6e020a656b9b275a0b5dbcde4ccommit | diff
parentb52a2940af7144486f0b2861bf737274aa00e87fcommit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  We don't cache custom strems with callbacks anymore

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