com php-src: Merge branch 'PHP-5.5' into PHP-5.6: travis/compile.sh
| From: | Ferenc Kovacs | Date: | Mon, 30 Jun 2014 10:30:49 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: travis/compile.sh | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79149@lists.php.net to get a copy of this message | ||
Commit: 3ec93ee19f174f27285872515d236028f0e079f9
Author: Ferenc Kovacs <tyrael@php.net> Mon, 30 Jun 2014 12:30:49 +0200
Parents: 6d8d5e9310831c8ebf001dd8d67fc1a6341bde88 803cfe32e657c3c3f3776f1470fd598f5e6a107a
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=3ec93ee19f174f27285872515d236028f0e079f9
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
--enable-fpm for the travis build
Changed paths:
MM travis/compile.sh
Diff: