summaryrefslogtreecommitdiff
path: root/main/php.h
diff options
context:
space:
mode:
authorSara Golemon <pollita@php.net>2014-01-30 02:05:49 -0800
committerSara Golemon <pollita@php.net>2014-01-30 02:05:49 -0800
commit45e2a557f151a75ae4e56ed8625744e1040b493a (patch)
tree335b49d7f0b2d891711b18d88271df6703bc5b67 /main/php.h
parent2cbd8572835a07ca2a1f3a2a302e78c7ce998e9a (diff)
parent179e45920cbedc3bee1a8c46457cb42b2926e5e4 (diff)
downloadphp-git-45e2a557f151a75ae4e56ed8625744e1040b493a.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Make html_table_gen consistent with html_table.h
Diffstat (limited to 'main/php.h')
0 files changed, 0 insertions, 0 deletions