granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f116a88 c4e11c8)

author	Joe Watkins <krakjoe@php.net>
	Mon, 24 Jul 2017 09:42:35 +0000 (10:42 +0100)
committer	Joe Watkins <krakjoe@php.net>
	Mon, 24 Jul 2017 09:42:35 +0000 (10:42 +0100)
commit	642fb44d6914960e415c74c6e712986fb604fa9d
tree	969718f1ae07046a22a8864b46d38447f9f6e1cc	tree \| snapshot
parent	f116a885921a008d9b94a7c1089aa85ae82461c3	commit \| diff
parent	c4e11c8ef379346e15f2dfc9e0d664e0cf8b088e	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Update PHP 5 version to 7 in header comments

ext/shmop/shmop.c

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