]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e8423b bd0b09c)
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Mon, 25 Mar 2013 02:04:43 +0000 (19:04 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 25 Mar 2013 02:04:43 +0000 (19:04 -0700)
* PHP-5.5:
  fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs


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