-
- Downloads
Merge branch 'master' into 'bundle-target'
# Conflicts: # build.xml
No related branches found
No related tags found
Showing
- .gitignore 6 additions, 0 deletions.gitignore
- .idea/ant.xml 0 additions, 6 deletions.idea/ant.xml
- .idea/compiler.xml 0 additions, 41 deletions.idea/compiler.xml
- .idea/copyright/profiles_settings.xml 0 additions, 3 deletions.idea/copyright/profiles_settings.xml
- .idea/libraries/javax_servlet_jsp_2_2_0_v201112011158.xml 0 additions, 9 deletions.idea/libraries/javax_servlet_jsp_2_2_0_v201112011158.xml
- .idea/libraries/jettylib.xml 0 additions, 22 deletions.idea/libraries/jettylib.xml
- .idea/libraries/jrobin_1_5_9_1.xml 0 additions, 9 deletions.idea/libraries/jrobin_1_5_9_1.xml
- .idea/libraries/lib.xml 0 additions, 10 deletions.idea/libraries/lib.xml
- .idea/libraries/start.xml 0 additions, 9 deletions.idea/libraries/start.xml
- .idea/libraries/systray4j.xml 0 additions, 9 deletions.idea/libraries/systray4j.xml
- .idea/libraries/tomcat_coyote_util.xml 0 additions, 9 deletions.idea/libraries/tomcat_coyote_util.xml
- .idea/libraries/tomcat_lib.xml 0 additions, 12 deletions.idea/libraries/tomcat_lib.xml
- .idea/libraries/wrapper.xml 0 additions, 9 deletions.idea/libraries/wrapper.xml
- .idea/libraries/wrapper_win.xml 0 additions, 9 deletions.idea/libraries/wrapper_win.xml
- .idea/misc.xml 0 additions, 57 deletions.idea/misc.xml
- .idea/modules.xml 0 additions, 80 deletions.idea/modules.xml
- .idea/runConfigurations/updater.xml 0 additions, 6 deletions.idea/runConfigurations/updater.xml
- .travis.yml 1 addition, 22 deletions.travis.yml
- .tx/config 30 additions, 14 deletions.tx/config
- INSTALL-headless.txt 1 addition, 1 deletionINSTALL-headless.txt
Loading
Please register or sign in to comment