Commit:    117d2dd6882b906ecc92fffe0b627535a48cd0c6
Author:    Anatoliy Belsky <a...@php.net>         Tue, 13 Nov 2012 19:40:22 
+0100
Parents:   4f36aeb1209d1521bcba912bdeb0d67a69df3af8 
019bdff3951f415e2d5c44933da30a4669c628e8
Branches:  PHP-5.4 PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=117d2dd6882b906ecc92fffe0b627535a48cd0c6

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Enabled apache 2.4 handler build option

Conflicts:
        sapi/apache2handler/config.w32

Changed paths:
  MM  sapi/apache2handler/config.w32


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to