Commit:    1a05648e6ddb6af847a34e7adf4bbea45409809c
Author:    Stanislav Malyshev <s...@php.net>         Sun, 21 Jul 2013 21:17:59 
-0700
Parents:   02457554a35fbb96fd3f51caf7deab91ca32ecb2 
2c23004a1e3eb14695e6c44e52e4d5fe2a2d37d9
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should 
contain the typo)
  mssql.compatability_mode fix

Conflicts:
        configure.in
        main/php_version.h

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


Diff:



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

Reply via email to