]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 23 Jun 2014 08:18:55 +0000 (10:18 +0200)
committerRemi Collet <remi@php.net>
Mon, 23 Jun 2014 08:18:55 +0000 (10:18 +0200)
commita52b927bf3d760c1979fc7d3f93fef63c28ec3b1
treea905601c1d761e50cfb54dcf6d8badb225f8f9cf
parentf5defa1cf2782f9c2b2ce44323a6d003d2e7af2d
parent98d41dfc9db53e2ecf5a244acf00be617ce49002
Merge branch 'PHP-5.6'

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