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

xufenglei

2018-03-13 d4f150414533b95324b2a1c8a81c11d92efb71ec

 .gitignore

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

generatorConfig.xml