]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eef2978 8bda4c6)
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
authorPierre Joye <pierre.php@gmail.com>
Mon, 10 Mar 2014 15:28:41 +0000 (16:28 +0100)
committerPierre Joye <pierre.php@gmail.com>
Mon, 10 Mar 2014 15:28:41 +0000 (16:28 +0100)
# By Anatol Belski (2) and others
# Via Anatol Belski (3) and others
* 'PHP-5.6' of git.php.net:php-src:
  updated libmagic.patch
  updated libmagic.patch
  Fix indentation
  Do not remove *.1, it's not generated by make but configure
  Fix typo: entory -> entry


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