php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 00:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
85,816 Commits 549 Branches 1,485 Tags
9fd0364576c470c1a1febc003eace88fe8d19c8d
Commit Graph

9 Commits

Author SHA1 Message Date
Remi Collet 770473a648 Merge branch 'PHP-5.6' 
* PHP-5.6:
  cleanup uneeded json
 2014-10-29 07:26:58 +01:00
Remi Collet 7dd871438f cleanup uneeded json 2014-10-29 07:26:41 +01:00
Bob Weinand 4fec48d1b0 Merge remote-tracking branch 'origin/PHP-5.6' 2014-10-28 23:07:46 +01:00
Bob Weinand a5415456d4 Merge phpdbg into PHP-5.6 2014-10-28 23:06:50 +01:00
Bob Weinand 66aead4b5f Merge remote-tracking branch 'origin/PHP-5.6' 
Conflicts:
	sapi/phpdbg/phpdbg_wait.c
	sapi/phpdbg/phpdbg_webdata_transfer.c
 2014-10-28 23:00:10 +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 2bcac53bca Made phpdbg compatible with new engine 2014-10-24 19:29:50 +02:00
Bob Weinand 9b4d9ac6c7 Merge phpdbg into PHP-5.6 2014-10-24 19:22:45 +02:00