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

Conflicts:
driver/others/memory.c
driver/others/memory.c