summaryrefslogtreecommitdiff
path: root/makerpm
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2014-12-04 11:12:32 +0100
committerFerenc Kovacs <tyrael@php.net>2014-12-04 11:12:32 +0100
commit9c5d84ace1daaf2dcd08c04b9c138940afdf5001 (patch)
tree73d07056697eca83f29a80fc53392284963e3871 /makerpm
parent52b41f24e32c2c3f503a90e4f9879babc945c8e7 (diff)
parent4f9f7c7948d8c852a5038a4a8787cc8b6f465940 (diff)
downloadphp-git-9c5d84ace1daaf2dcd08c04b9c138940afdf5001.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: 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 'makerpm')
0 files changed, 0 insertions, 0 deletions