]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 23 Jun 2014 08:39:22 +0000 (10:39 +0200)
committerRemi Collet <remi@php.net>
Mon, 23 Jun 2014 08:39:22 +0000 (10:39 +0200)
commit70e29fc24ccf503b46647ab5e598fca4c0c45b54
treea905601c1d761e50cfb54dcf6d8badb225f8f9cf
parenta52b927bf3d760c1979fc7d3f93fef63c28ec3b1
parentb3ef019b621bc2cfc9c636bcc900e52ed68aaef1
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91