]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Wed, 17 Apr 2013 17:27:19 +0000 (21:27 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 17 Apr 2013 17:27:19 +0000 (21:27 +0400)
commitbc959fbafff50d4a7c88814097d992b7439da106
tree4175d1150f15c685b3986bbe3b869cada8328b33
parentcd3dc3308ba5ebc8abfb393a10011a1478048872
parent5a897009a83bba1a0f32982d7438d6967d1eddeb
Merge branch 'PHP-5.5'

* PHP-5.5:
  Initialize literals hash_value and cache_slot

Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
ext/opcache/Optimizer/zend_optimizer.c