summaryrefslogtreecommitdiff
path: root/main/output.c
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2014-12-04 11:12:42 +0100
committerFerenc Kovacs <tyrael@php.net>2014-12-04 11:12:42 +0100
commitf8e7b3d166a4aba2ebd9469731b01ccd30065184 (patch)
tree77889efeb335a94284d4a7ff2038a3ea5fd6aa89 /main/output.c
parent7e933c5ff89ae3dc8b48f94ad9c9a8bc77d93a25 (diff)
parent9c5d84ace1daaf2dcd08c04b9c138940afdf5001 (diff)
downloadphp-git-f8e7b3d166a4aba2ebd9469731b01ccd30065184.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: add initial install switch to C travis project instead of PHP use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
Diffstat (limited to 'main/output.c')
0 files changed, 0 insertions, 0 deletions