diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-10-02 22:32:18 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-10-02 22:32:18 +0200 |
| commit | 7a529790b2c1bf6f20affbe06914de32fcc94fb3 (patch) | |
| tree | 990135b045d61430a5febfc85663cd01935ad7be /.gitignore | |
| parent | 26f4e406222fe428dc5f8853db0bab5d8afa372d (diff) | |
| parent | d7b01aff89bab42c6672b3a432983137fae8a0ab (diff) | |
| download | php-git-7a529790b2c1bf6f20affbe06914de32fcc94fb3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
we also have xz release tarballs since 5.5
5.5.19 now
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b9dd252267..7f4f814050 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ *.tgz *.tar.gz *.tar.bz2 +*.tar.xz .FBCIndex .FBCLockFolder .deps |