Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

pansen

2019-01-10 4f70d72daca6818a8a7ba36d794b0cd7f985cbcc

 .gitignore

@@ -19,3 +19,15 @@
*.exe
*.out
*.app

QiaoJiaSystem/\.idea/

QiaoJiaSystem/cmake-build-debug/

*.cmake

build-QiaoJiaSystem-unknown-Default/

QiaoJiaSystem/build/glog_dump\.log

QiaoJiaSystem/CMakeLists\.txt\.user