]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bccbd2d 54b288a)
Merge branch 'master' of http://git.php.net/repository/php-src
authorChristoph M. Becker <cmb@php.net>
Mon, 13 Jul 2015 15:50:26 +0000 (17:50 +0200)
committerChristoph M. Becker <cmb@php.net>
Mon, 13 Jul 2015 15:50:26 +0000 (17:50 +0200)
# By Christoph M. Becker (3) and Bob Weinand (2)
* 'master' of http://git.php.net/repository/php-src:
  updated NEWS
  updated NEWS
  Fix #69024: imagescale segfault with palette based image
  Fix weird asm instruction order with gcc by marking as volatile in phpdbg
  Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled


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