]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorFelipe Pena <felipensp@gmail.com>
Sat, 15 Feb 2014 13:05:08 +0000 (11:05 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sat, 15 Feb 2014 13:05:08 +0000 (11:05 -0200)
* PHP-5.4:
  - Fix ZTS build when HAVE_PQESCAPELITERAL is not set
  Update NEWS

1  2 
ext/pgsql/pgsql.c

Simple merge