com php-src: Merge branch 'PHP-5.5' into PHP-5.6: .gitignore
| From: | Ferenc Kovacs | Date: | Thu, 02 Oct 2014 20:32:18 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: .gitignore | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82054@lists.php.net to get a copy of this message | ||
Commit: 7a529790b2c1bf6f20affbe06914de32fcc94fb3
Author: Ferenc Kovacs <tyrael@php.net> Thu, 2 Oct 2014 22:32:18 +0200
Parents: 26f4e406222fe428dc5f8853db0bab5d8afa372d d7b01aff89bab42c6672b3a432983137fae8a0ab
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7a529790b2c1bf6f20affbe06914de32fcc94fb3
Log:
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
Changed paths:
MM .gitignore
Diff: