]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6718b56 8192d64)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Fri, 17 Apr 2015 15:38:03 +0000 (18:38 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 17 Apr 2015 15:38:03 +0000 (18:38 +0300)
* 'master' of git.php.net:php-src:
  fix column name attribute with ODBC 3.0
  migrate SQLAllocStmt for ODBC 3.0 compliance


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