Commit graph

6 commits

Author SHA1 Message Date
Anatol Belski
f842b8f4be unix sockets aren't available on windows 2014-10-29 19:39:46 +01:00
Remi Collet
7dd871438f cleanup uneeded json 2014-10-29 07:26:41 +01:00
Bob Weinand
a5415456d4 Merge phpdbg into PHP-5.6 2014-10-28 23:06:50 +01:00
Bob Weinand
be5d389768 Merge phpdbg into PHP-5.6 2014-10-28 22:44:29 +01:00
Bob Weinand
6150d9342c Merge ../phpdbg into PHP-5.6
Conflicts:
	sapi/phpdbg/config.m4
2014-10-28 22:15:05 +01:00
Bob Weinand
9b4d9ac6c7 Merge phpdbg into PHP-5.6 2014-10-24 19:22:45 +02:00