Merge branch 'hpanderson_cmake' into cmake
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 10 Aug 2015 19:31:55 +0000 (03:31 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 10 Aug 2015 19:31:55 +0000 (03:31 +0800)
commit40ab5cfc5040ddaf871324a56d21b47401849ad8
treef926443924b7a5536d50b19f5eab639be9fe89a7
parentf874465bb81d10e7cdb88a10cff7d62df3fe370c
parentb7a8f9ad4700724e46173be6ac1849b8a10d3b5f
Merge branch 'hpanderson_cmake' into cmake