]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 43477bc 58fc40d)
Merge branch 'phpng' into call-frame
authorDmitry Stogov <dmitry@zend.com>
Wed, 25 Jun 2014 07:12:32 +0000 (11:12 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 25 Jun 2014 07:12:32 +0000 (11:12 +0400)
commit0f9d5baba23209bec2c1881941c3765d43c2b2ce
tree39493cf0ae903bbae7d8a7497fe2860a2b18eed9tree | snapshot
parent43477bc7a2da3077abf290b13571f532979db57acommit | diff
parent58fc40d5256db71c708e8d1242f94634d9652a47commit | diff
Merge branch 'phpng' into call-frame

* phpng:
  Remove temp file committed by accident
  Don't use zend_string for other fields (only name here is enough)
  Fixed _zend_get_parameters_array
  Fixed use of uninitialized value
  Cleanup (refactoring is finish)
  We don't need extra 1 byte anymore

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