]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Mon, 8 Jan 2018 04:57:02 +0000 (12:57 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 8 Jan 2018 04:57:02 +0000 (12:57 +0800)
* 'master' of git.php.net:/php-src:
  Implement high resolution monotonic timer function hrtime()


Trivial merge