com php-src: Merge branch 'PHP-7.2' into PHP-7.3: .gitignore Makefile.global sapi/phpdbg/config.m4
| From: | Peter Kokot | Date: | Sat, 04 Aug 2018 04:37:15 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: .gitignore Makefile.global sapi/phpdbg/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102805@lists.php.net to get a copy of this message | ||
Commit: 0f57a7f259f0e3ce58f6418fa6a1ccbc7c5bf0bc
Author: Peter Kokot <peterkokot@gmail.com> Sat, 4 Aug 2018 06:37:15 +0200
Parents: 2ea7222440c92561e9774bb5d32ff1135935ef93 9286681bac2c7dcd99e7de62eb8b963c0736e31d
Branches: PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f57a7f259f0e3ce58f6418fa6a1ccbc7c5bf0bc
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug 76595: Update phpdbg man page
Bugs:
https://bugs.php.net/76595
Changed paths:
MM .gitignore
MM Makefile.global
MM sapi/phpdbg/config.m4
Diff:
diff --cc .gitignore
index 16769d3,2e45e0a..691968a
--- a/.gitignore
+++ b/.gitignore
@@@ -83,49 -84,10 +83,50 @@@ shlibtoo
stamp-h
test.php3
tmp-php.ini
-want_dependencies
stamp-h.in
scan_makefile_in.awk
+main/php_config.h
+main/php_config.h.in
+main/build-defs.h
+main/internal_functions_cli.c
+main/config.w32.h
+main/stamp-h1
+main/streams/build-defs.h
+main/streams/stamp-h1
+pear/install-pear-nozlib.phar
+pear/phpize
+pear/run-tests
+pear/php-config
+pear/scripts
+sapi/apache2handler/libphp7.module
+sapi/cgi/php-cgi
+sapi/cgi/php-cgi.1
+sapi/cli/php.1
+sapi/fpm/php-fpm
+sapi/fpm/php-fpm.1
+sapi/fpm/init.d.php-fpm
+sapi/fpm/php-fpm.conf
+sapi/fpm/fpm/php-cgi
+sapi/fpm/php-fpm.8
+sapi/fpm/php-fpm.service
+sapi/fpm/status.html
+sapi/fpm/www.conf
+sapi/phpdbg/phpdbg_parser.c
+sapi/phpdbg/phpdbg_parser.h
+sapi/phpdbg/phpdbg
++sapi/phpdbg/phpdbg.1
+sapi/phpdbg/build
+sapi/phpdbg/*.output
+scripts/php-config
+scripts/phpize
+scripts/man1/*.1
TSRM/tsrm_config.h
+win32/*.suo
+win32/*.aps
+win32/*.positions
+win32/ext
+win32/phpts.def
+win32/wsyslog.h
Zend/zend_config.h
Zend/zend_dtrace_gen.h
Zend/zend_dtrace_gen.hbak