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)
commitd254b9052108ce7c6bbce6f1fb2095bcd53aaca1
treeb8bb60e92c92c1c7fc6ee528c26ac31ee5720a1f
parent43cbf733800129fde1fc741e0bf5e11f3edfc86e
parent96ae9d09298e8dd19e6b655bbec2391f97db6fc7
Merge branch 'master' of github.com:texane/stlink

* 'master' of github.com:texane/stlink:
  travis: Add gcc-5 and clang-3.8 to matrix for linux cmake builds