]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 770cb1d 0ec3a6f)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Tue, 21 Apr 2015 23:30:10 +0000 (02:30 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 21 Apr 2015 23:30:10 +0000 (02:30 +0300)
* 'master' of git.php.net:php-src:
  FAST_RET opcode also returns
  Also consider specific catches when checking for uncaught
  Break on uncaught exceptions in current frame in phpdbg


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