Merge branch 'cmake' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 26 Oct 2015 19:54:59 +0000 (14:54 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 26 Oct 2015 19:54:59 +0000 (14:54 -0500)

Trivial merge