Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

7 天以前 893d4fad6e5612ea01c8dab60a89187136ebd23b

 .gitignore

@@ -25,6 +25,8 @@
*.iml

*.ipr



### JRebel ###

rebel.xml

### NetBeans ###

nbproject/private/

build/*

@@ -37,6 +39,7 @@
# Others

*.log

*.xml.versionsBackup

*.swp



!*/build/*.java

!*/build/*.html