Merge branch 'develop' into releases/Release_2_11_2_Branch

[jalview.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c78ace4..616d27d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /*.project
 /.classpath
-/.settings/org.eclipse.jdt.core.prefs
+/.settings/*
+!/.settings/org.eclipse.buildship.core.prefs
 /dist
 /clover
 /classes
@@ -17,19 +18,29 @@ TESTNG
 /benchmarking/lib
 *.class
 /site
+/site-resources
+/libjs
 /.gradle
 /build
-/utils/HelpLinksChecker.touch
+/local.properties
+/utils/HelpLinksChecker.out
 /getdown/website
 /getdown/full_app
 /getdown/files
+/getdown/old
 /getdown/src/getdown/*/target/
 /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
+/resources/channel_properties
+/help/help/html/releases.html
+/help/help/html/whatsNew.html