Skip to content
Snippets Groups Projects
Commit 0b15aa47 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.4' into v2.5

parents 33c53136 5a30b45e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
.travis.yml
+ 1
− 1
View file @ 0b15aa47
...@@ -117,7 +117,7 @@ install: ...@@ -117,7 +117,7 @@ install:
# a specific old version of asmjit is required: # a specific old version of asmjit is required:
- if test -n "$ASMJIT" ; then ./.travis/install.asmjit $ASMJIT ; fi - if test -n "$ASMJIT" ; then ./.travis/install.asmjit $ASMJIT ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
./.travis/install.ccache v3.4.3 ; ./.travis/install.ccache v3.5 ;
fi fi
# cppcheck: # cppcheck:
# I use 1.71 since 1.72 seems to report a lot of false positive # I use 1.71 since 1.72 seems to report a lot of false positive
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment