Merge branch 'master' into GetRidOfCUDA
authorJens Steube <jens.steube@gmail.com>
Fri, 1 Jan 2016 00:09:24 +0000 (01:09 +0100)
committerJens Steube <jens.steube@gmail.com>
Fri, 1 Jan 2016 00:09:24 +0000 (01:09 +0100)
commit6893a9ad857a1d4fe63f1a92365802f5d9d3b39e
tree0d22d5669c2eaedd5eca0e03dab5eb87118c3d76
parent700ed7dba7a049eab8f70fa34b8f80aa41a757c2
parent1146c43986a36359f217f76fd2efc14203740494
Merge branch 'master' into GetRidOfCUDA

Conflicts:
docs/BUILD.md