summaryrefslogtreecommitdiff
path: root/main/php.h
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-06-09 21:34:06 -0700
committerStanislav Malyshev <stas@php.net>2015-06-09 21:34:06 -0700
commitc095af584c47826a6a994e2c14657d04140addcb (patch)
tree4f3bff79dbca1dbd8c4c23ab730734670ed9ddc6 /main/php.h
parent1346c3df42a281226ec9f771438329594bf45f93 (diff)
parente10af61862154a824fee31ea6bc321414023054c (diff)
downloadphp-git-c095af584c47826a6a994e2c14657d04140addcb.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fixed bug #68776
Diffstat (limited to 'main/php.h')
0 files changed, 0 insertions, 0 deletions