]> granicus.if.org Git - php/commitdiff
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)
* '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


Trivial merge