]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9f3eac 3ab892e)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Fri, 15 Aug 2014 07:13:42 +0000 (11:13 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 15 Aug 2014 07:13:42 +0000 (11:13 +0400)
* 'master' of git.php.net:php-src:
  Update Version Number :)
  Fixed initializing
  Unused variable

Conflicts:
main/php_version.h


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