Merge branch 'master' of github.com:texane/stlink
authorJerry Jacobs <jerry.jacobs@xor-gate.org>
Fri, 20 May 2016 21:30:51 +0000 (23:30 +0200)
committerJerry Jacobs <jerry.jacobs@xor-gate.org>
Fri, 20 May 2016 21:30:51 +0000 (23:30 +0200)
* 'master' of github.com:texane/stlink:
  travis: Add gcc-5 and clang-3.8 to matrix for linux cmake builds


Trivial merge