]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5defa1 98d41df)
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)
* PHP-5.6:
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91


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