Commit 88dce91f authored by Damir Franusic's avatar Damir Franusic

Merge remote-tracking branch 'upstream/vlm_master' into vlm_master

parents 86b92342 92d2802c
......@@ -23,6 +23,9 @@ matrix:
exclude:
- os: osx
compiler: gcc
allow_failures:
- os: osx
env: TASK=distcheck
before_install:
- |
......
Markdown is supported
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