]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 494870f d66cb72)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 19 Apr 2015 00:57:18 +0000 (17:57 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 19 Apr 2015 00:57:18 +0000 (17:57 -0700)
* PHP-5.6:
  Remove unused code from ext/json.

Conflicts:
ext/json/config.m4
ext/json/config.w32
ext/json/json.dsp
ext/json/package.xml


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.