diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-12-17 14:30:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-12-17 14:30:00 +0800 |
| commit | 9374977d215be414d6e2e98b041a2b8f9b9a1e8d (patch) | |
| tree | 15b28cb867460a81ac1956cd8c241cd23e1c9827 /.gitignore | |
| parent | c7c3b967a550b4f1137d6a7b2bf56ec1e4f6dbbd (diff) | |
| parent | 940c68b55d4241f9f34d4f71064f5f12a44e8d3d (diff) | |
| download | php-git-9374977d215be414d6e2e98b041a2b8f9b9a1e8d.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/opcache/Optimizer/pass1_5.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 4e5cfa7c60..a00615f966 100644 --- a/.gitignore +++ b/.gitignore @@ -245,10 +245,6 @@ ext/reflection/spl.chm ext/simplexml/examples/security.new.xml ext/spl/examples/.htaccess ext/spl/examples/*.phps -ext/sqlite/weztest.sqlite -ext/sqlite/libsqlite/src/sqlite.h -ext/sqlite/libsqlite/src/parse.out -ext/sqlite/libsqlite/src/libsqlite.dsw ext/sqlite3/tests/phpsql* ext/sqlite3/tests/*.db ext/sqlite3/tests/*.tmp |