]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57dd91b 74e52ea)
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Tue, 4 Jun 2013 05:03:25 +0000 (22:03 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 4 Jun 2013 05:03:25 +0000 (22:03 -0700)
* PHP-5.5:
  news for dblib fixes
  FIX BUG #55647, #60512, #60512, #61900, #64338, #64808, #63638
  Fix PDO_DBLIB bugs: #64338, #64808, #63638

Conflicts:
ext/pdo_dblib/dblib_driver.c
ext/pdo_dblib/dblib_stmt.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.