diff options
| author | Will Fitch <willf@aweber.com> | 2014-01-23 21:34:57 -0500 |
|---|---|---|
| committer | Will Fitch <willf@aweber.com> | 2014-01-23 21:34:57 -0500 |
| commit | c0acb9d5f6fc5b8cd1b389877deb2f9452b6ee0b (patch) | |
| tree | 68166d3fd64c7f73be70611ecee320836c7597d7 /.gitignore | |
| parent | c0fcd3d6b021ac1386d417aa129f76e458b5d769 (diff) | |
| parent | c4c10a222e4358b1d9d28ef852e8a5d56709865d (diff) | |
| download | php-git-c0acb9d5f6fc5b8cd1b389877deb2f9452b6ee0b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update gitignore and Makefile for additional entries
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index cf615c6e92..8d0e7565f2 100644 --- a/.gitignore +++ b/.gitignore @@ -206,6 +206,8 @@ ext/pdo_sqlite/sqlite3.h ext/pdo_sqlite/tests/*.db ext/pdo_sqlite/tests/*.tmp ext/phar/phar.phar +ext/phar/phar.1 +ext/phar/phar.phar.1 ext/pspell/tests/*.tmp ext/reflection/xml ext/reflection/html @@ -237,12 +239,14 @@ sapi/apache/libphp5.module sapi/apache2handler/libphp5.module sapi/apache_hooks/libphp5.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/phpdbg/phpdbg scripts/php-config scripts/phpize scripts/man1/*.1 |