Merge remote-tracking branch 'origin/master'

chenshijun

2019-07-10 a632de61f234cffbfa60c990f3a6112214d9b9d7

 .gitignore

@@ -5,17 +5,20 @@
*.obj

# Compiled Dynamic libraries
*.so
# *.so
*.dylib
*.dll

# Compiled Static libraries
*.lai
*.la
*.a
# *.a
*.lib

# Executables
*.exe
*.out
*.app


build/