]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a65a546 9f25154)
Merge branch 'PHP-5.4' into PHP-5.5
authorYasuo Ohgaki <yohgaki@php.net>
Sat, 15 Feb 2014 21:25:01 +0000 (06:25 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Sat, 15 Feb 2014 21:25:01 +0000 (06:25 +0900)
* PHP-5.4:
  Revise encoding blacklist

1  2 
ext/pgsql/pgsql.c patch | diff1 | diff2 | blob | history

diff --cc ext/pgsql/pgsql.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.