]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
authorJoe Watkins <krakjoe@php.net>
Tue, 24 Dec 2013 09:02:52 +0000 (09:02 +0000)
committerJoe Watkins <krakjoe@php.net>
Tue, 24 Dec 2013 09:02:52 +0000 (09:02 +0000)
commit7b17d6c4bf8dcde0f627203c91e2c7bc66f7c435
tree0fa9c01cd26b20f06431176f53ac626f1f9e690b
parent265fdd91390a38deafbd193d4831c2e9db3b06fe
parentca882858f41adca912e267559fead5245070587f
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6

* 'PHP-5.6' of https://git.php.net/repository/php-src:
  Fixed credits in phpdbg.* files
  Added breaking upon fatal-ish error
  credits file for phpdbg
  Fixed credits in phpdbg.* files
  reformat
  credits file