Merge branch 'master' into master
authorDror Kronstein <dkronst@gmail.com>
Wed, 5 Oct 2016 10:32:16 +0000 (13:32 +0300)
committerGitHub <noreply@github.com>
Wed, 5 Oct 2016 10:32:16 +0000 (13:32 +0300)
commit799cda9b6bf6c46a65355a065cc8d41f15c147aa
tree147409ee1c287542ab8a5489639a12ba6f075b89
parent86ec63fc65ddd24b9711dd4409d283b7a4f876b2
parentba404cfe50dc9b90ad4c619244bbbd93468adc27
Merge branch 'master' into master
CMakeLists.txt