OSDN Git Service

merge master into dev
authorZhiting Lin <zlin035@uottawa.ca>
Mon, 26 Nov 2018 09:12:59 +0000 (17:12 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Mon, 26 Nov 2018 09:12:59 +0000 (17:12 +0800)
commiteb64d4c895aa56003403d3cc477de7360d3439ef
treeba0c2050d9e58003d7436348d14493a6d977b927
parent68a3d790813df99fd9e5542a8926e303280346da
parenta860068ec36364ba3b84b7391ae4154fd04ce649
merge master into dev