]> granicus.if.org Git - php/commit
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)
commit2f895de2eefeb711a6640a79d9d011b37c2ed6ee
tree65d5d3f8d8244972b594765a655a40592d39e1a2
parenta3c8fbdd120f4ee61e91aabb6706ebd55efaf790
parent2f574e282e40874dfb8a03826a8c3c8576911bb2
Merge branch 'phpng' into call-frame

* 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