]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5b0560e 9976b5c)
Merge branch 'PHP-5.4' into PHP-5.5
authorFelipe Pena <felipensp@gmail.com>
Sun, 20 Oct 2013 11:50:13 +0000 (09:50 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sun, 20 Oct 2013 11:50:13 +0000 (09:50 -0200)
commit8aa19c9fd8bcccd76d5246064fd4eab4e4b5c4f2
tree37e2984c4e288f6f40e8840ea99622ecaeb4254dtree | snapshot
parent5b0560efc3e803cdb59d161cb3cd660e388b211fcommit | diff
parent9976b5cd7f36d90b49d1dcf58ec6497f0e592b7dcommit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Moved NULL check before dereferencing
ext/zip/php_zip.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.