]> granicus.if.org Git - php/commit
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 23 Apr 2015 00:43:55 +0000 (03:43 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 23 Apr 2015 00:43:55 +0000 (03:43 +0300)
commit801768f72ceb5682b3bc6c10827f747d93753a58
treea46d550422051bb40d48a6bb58d983f9cc219453
parent6d4da2db8a5e77391182db271e1ed8e4e56eca88
parent1ce220624456929649d95ae31d0a8c318e25c68e
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  libpq versions older than 9.3 do not have lo_lseek64
  fix include with vc14
  fix compilation with vc14
  improve zpp readme