Merge branch 'develop' into releases/Release_2_11_2_Branch

[jalview.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a6ca5a7..cd56818 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 /*.project
-.classpath
+/.classpath
+/.settings/*
+!/.settings/org.eclipse.buildship.core.prefs
 /dist
 /clover
 /classes
@@ -7,7 +9,6 @@
 /test-reports
 /test-output
 .externalToolBuilders/*
-.settings/*
 /.DS_Store
 .DS_Store
 /.com.apple.timemachine.supported
@@ -17,13 +18,26 @@ TESTNG
 /benchmarking/lib
 *.class
 /site
+/site-resources
+/libjs
 /.gradle
 /build
+/local.properties
 /utils/HelpLinksChecker.out
-/.settings
 /getdown/website
 /getdown/full_app
 /getdown/files
-/.classpath
+/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
+/.j2s
+/template.html
+/jalviewjsTest.html
+/site1
+/site2
+/resources/.build_properties
+/resources/channel_properties