]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Tue, 23 Aug 2016 03:33:12 +0000 (11:33 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 23 Aug 2016 03:33:12 +0000 (11:33 +0800)
* 'master' of git.php.net:/php-src:
  sync shm* implementation signatures with POSIX


Trivial merge