]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1c539c 39f0b58)
Merge branch 'phpng' of git.php.net:php-src into phpng
authorDmitry Stogov <dmitry@zend.com>
Thu, 15 May 2014 08:14:08 +0000 (12:14 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 15 May 2014 08:14:08 +0000 (12:14 +0400)
* 'phpng' of git.php.net:php-src:
  fix invalid use of STR_FREE > efree
  RETURN_STRING takes the char* only now (always copied)
  RETURN_STRING takes the char* only now
  fix build


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