Merge branch 'master' into arm64
authorSteveXiSong <songxi.buaa@gmail.com>
Sat, 14 Nov 2015 01:22:22 +0000 (19:22 -0600)
committerSteveXiSong <songxi.buaa@gmail.com>
Sat, 14 Nov 2015 01:22:22 +0000 (19:22 -0600)
commit613068c13f473c7163669057c982b7662c76bc88
treeaa3aa1028f9091e4d9cc02d1aebf482ac61677cb
parentffcd91d1f2f700cc6ee35035a7e4a872683fe8e5
parent2a9f0ed453e7098d3bc3fefd144a114470dd20cc
Merge branch 'master' into arm64