summaryrefslogtreecommitdiff
path: root/main/php.h
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2015-10-09 23:28:58 +0200
committerNikita Popov <nikic@php.net>2015-10-09 23:28:58 +0200
commitd677b25b1c5fba2451ddeedb22cad29e1cda15cb (patch)
tree797e88975bd44d831b752973f77bc9e7d9dfa81f /main/php.h
parentf6ae19f15824104e8d90c4b364cc42e960f059fd (diff)
parente19423f3cbeaf2ac57a4af1e7c5b84fc6721177b (diff)
downloadphp-git-d677b25b1c5fba2451ddeedb22cad29e1cda15cb.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'main/php.h')
0 files changed, 0 insertions, 0 deletions