Merge branch 'hpanderson_cmake' into cmake
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 21 Jul 2015 20:07:27 +0000 (04:07 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 21 Jul 2015 20:07:27 +0000 (04:07 +0800)
commita55377e9a4716553b003e63f75b18b3768d3015c
treed581a12603ee8075fb6cf4353313347f968ab2be
parent3f1b57668e3d73944981d7bda194ca133f4660b7
parentdcd5ba4443a303f342a1227fe0ca044f8466952c
Merge branch 'hpanderson_cmake' into cmake