]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f37ac6f bb6d749)
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 16 Jul 2013 16:05:45 +0000 (18:05 +0200)
committerAnatol Belski <ab@php.net>
Tue, 16 Jul 2013 16:05:45 +0000 (18:05 +0200)
* PHP-5.4:
  fix TS build

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

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