From: Anatol Belski <ab@php.net>
Date: Thu, 24 Apr 2014 09:05:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~346^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd2641973cbd665301739593a291a1fa78a05578;p=php

Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
---

cd2641973cbd665301739593a291a1fa78a05578
diff --cc sapi/phpdbg/.gitignore
index af445861ac,0000000000..5506a2652d
mode 100644,000000..100644
--- a/sapi/phpdbg/.gitignore
+++ b/sapi/phpdbg/.gitignore
@@@ -1,7 -1,0 +1,5 @@@
 +.libs/
 +phpdbg
 +*.lo
 +*.o
 +build
- phpdbg_parser.c
- phpdbg_parser.h
diff --cc sapi/phpdbg/phpdbg_parser.c
index 0000000000,79af58f8c9..79af58f8c9
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_parser.c
+++ b/sapi/phpdbg/phpdbg_parser.c
diff --cc sapi/phpdbg/phpdbg_parser.h
index 0000000000,6acb8963c9..6acb8963c9
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_parser.h
+++ b/sapi/phpdbg/phpdbg_parser.h