com php-src: Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6: sapi/litespeed/lsapilib.c
| From: | Anatol Belski | Date: | Thu, 10 Jul 2014 20:15:52 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6: sapi/litespeed/lsapilib.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79406@lists.php.net to get a copy of this message | ||
Commit: fbc21af87b752b99f6b78503cadc89dbba6c98f1
Author: Anatol Belski <ab@php.net> Thu, 10 Jul 2014 22:15:52 +0200
Parents: 552cfcc578b5372ecae08aaf600df8b469f20100 7f41a34c231c248077f2b6d949ade2dbf270652a
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fbc21af87b752b99f6b78503cadc89dbba6c98f1
Log:
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Conflicts:
sapi/litespeed/lsapilib.h
Changed paths:
MM sapi/litespeed/lsapilib.c
Diff: