]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0579e82 0cef7d1)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 15 Jan 2015 16:48:11 +0000 (17:48 +0100)
committerAnatol Belski <ab@php.net>
Thu, 15 Jan 2015 16:48:11 +0000 (17:48 +0100)
* PHP-5.5:
  updated NEWS
  PDO_MySQL: Differentiate between linux and win32 when passing unix_socket

1  2 
ext/pdo_mysql/mysql_driver.c patch | diff1 | diff2 | blob | history

diff --cc ext/pdo_mysql/mysql_driver.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.