X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=.gitignore;h=cd56818ea509cec6c18e6efca6c125be3fd29536;hp=35be978507f515e5bfe6aa0f75740e4fc087a46d;hb=14e1f9dbb9c7a4535734fd3be7ddeee2a5ae72dc;hpb=133fe28024b59a8103cbd6beb10c15e18e37e0dc

diff --git a/.gitignore b/.gitignore
index 35be978..cd56818 100644
--- 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,6 +18,8 @@ TESTNG
 /benchmarking/lib
 *.class
 /site
+/site-resources
+/libjs
 /.gradle
 /build
 /local.properties
@@ -28,12 +31,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
-/resource/.build_properties
+/resources/.build_properties
+/resources/channel_properties