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)
commitf74ff6da38e6233bd34a31ce341dad1dd7934144
tree0ef300883c98bc95524b4304a9f2af8747fe09b6
parent5a291606adaf425f34dc7223a7775b93518c08cf
parent2feef49fa8b3d288620de829b213df2dcf6e0529
Merge branch 'cmake' into develop