]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f8506c0 4d4c6cf)
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
authorDmitry Stogov <dmitry@zend.com>
Thu, 10 Mar 2016 10:34:41 +0000 (13:34 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 10 Mar 2016 10:34:41 +0000 (13:34 +0300)
* 'PHP-7.0' of git.php.net:php-src:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)


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