]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3c8fbd 2f574e2)
Merge branch 'phpng' into call-frame
authorDmitry Stogov <dmitry@zend.com>
Fri, 27 Jun 2014 17:52:46 +0000 (21:52 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 27 Jun 2014 17:52:46 +0000 (21:52 +0400)
* phpng:
  Suppress warning
  Refactoring ext/intl (incompleted)
  Fixed build with libmysql
  C++ compiler doesn't allow cast a void * to other pointer type

Conflicts:
Zend/zend_execute.h


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