]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 52b41f2 4f9f7c7)
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Thu, 4 Dec 2014 10:12:32 +0000 (11:12 +0100)
committerFerenc Kovacs <tyrael@php.net>
Thu, 4 Dec 2014 10:12:32 +0000 (11:12 +0100)
commit9c5d84ace1daaf2dcd08c04b9c138940afdf5001
tree73d07056697eca83f29a80fc53392284963e3871tree | snapshot
parent52b41f24e32c2c3f503a90e4f9879babc945c8e7commit | diff
parent4f9f7c7948d8c852a5038a4a8787cc8b6f465940commit | diff
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/)
.travis.yml diff1 | diff2 | blob | history
run-tests.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.