Merge branch '1.0'

This commit is contained in:
Alexey Kopytov
2017-05-02 15:03:48 -07:00

View File

@ -36,12 +36,14 @@ env:
- OS=ubuntu DIST=trusty
- OS=ubuntu DIST=xenial
- OS=ubuntu DIST=yakkety
- OS=ubuntu DIST=zesty
- OS=debian DIST=wheezy
- OS=debian DIST=jessie
- OS=ubuntu DIST=precise ARCH=i386
- OS=ubuntu DIST=trusty ARCH=i386
- OS=ubuntu DIST=xenial ARCH=i386
- OS=ubuntu DIST=yakkety ARCH=i386
- OS=ubuntu DIST=zesty ARCH=i386
- OS=debian DIST=wheezy ARCH=i386
- OS=debian DIST=jessie ARCH=i386
@ -63,6 +65,8 @@ matrix:
compiler: clang
- env: OS=ubuntu DIST=yakkety
compiler: clang
- env: OS=ubuntu DIST=zesty
compiler: clang
- env: OS=debian DIST=wheezy
compiler: clang
- env: OS=debian DIST=jessie
@ -77,6 +81,8 @@ matrix:
compiler: clang
- env: OS=ubuntu DIST=yakkety ARCH=i386
compiler: clang
- env: OS=ubuntu DIST=zesty ARCH=i386
compiler: clang
- env: OS=debian DIST=wheezy ARCH=i386
compiler: clang
- env: OS=debian DIST=jessie ARCH=i386
@ -99,6 +105,8 @@ matrix:
os: osx
- env: OS=ubuntu DIST=yakkety
os: osx
- env: OS=ubuntu DIST=zesty
os: osx
- env: OS=debian DIST=wheezy
os: osx
- env: OS=debian DIST=jessie