]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 319ce22 d2e416a)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 28 Aug 2014 09:13:52 +0000 (13:13 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 28 Aug 2014 09:13:52 +0000 (13:13 +0400)
* 'master' of git.php.net:php-src:
  fix pg_last_notice()
  Changed 'unsigned size_t' to 'size_t'
  Fixed segfaults after change size_t of "s"
  Fixed zend extensions multipy-times loadable
  Revert "Fixed incompatible pointer type"
  fix hash_pbkdf2()


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