Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-29 ef3a45a366ea8451f2581547fa6a3894bd1d672f

 .gitignore

@@ -21,4 +21,6 @@
nbbuild/
dist/
nbdist/
.nb-gradle/
.nb-gradle/

generatorConfig.xml