]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f25c328 385d0e5)
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Mon, 25 Mar 2013 03:12:33 +0000 (20:12 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 25 Mar 2013 03:12:33 +0000 (20:12 -0700)
* PHP-5.5:
  add code to check if we know flock definition on this system


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