Merge branch 'develop' into improvement/JAL-3449_add_install4j_installer_getdown_vers...

[jalview.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a2a64e7..8601715 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ TESTNG
 /site
 /.gradle
 /build
+/local.properties
 /utils/HelpLinksChecker.out
 /getdown/website
 /getdown/full_app
@@ -27,5 +28,13 @@ TESTNG
 /getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Build.java
 /getdown/src/getdown/launcher/dependency-reduced-pom.xml
 /utils/install4j/jalview-installers-*.install4j
+/utils/install4j/jalview-install4j-conf.install4j
 *.swp
 /bin
+/doc/building.html
+/.j2s
+/template.html
+/jalviewjsTest.html
+/site1
+/site2
+/resources/.build_properties