summaryrefslogtreecommitdiff
path: root/sapi/tux/php_tux.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-09-19 20:15:56 +0200
committerAnatol Belski <ab@php.net>2014-09-19 20:15:56 +0200
commitf6c02239caa84b0cf0ed1ce3fecc87cd0008e413 (patch)
treeba0072401f88d15a1dc5f325d060c298041b50ce /sapi/tux/php_tux.c
parentc343ca4efba7e600f7d20c73fde34dbda8192e48 (diff)
parent6213d9fc91de457b08e574a0f1ac8073eb948b17 (diff)
downloadphp-git-f6c02239caa84b0cf0ed1ce3fecc87cd0008e413.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: fix possible array underflow Conflicts: ext/standard/image.c
Diffstat (limited to 'sapi/tux/php_tux.c')
0 files changed, 0 insertions, 0 deletions