Update to latest to enable merge

diff --git a/.gitignore b/.gitignore
index f59eab3..46cc0e5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /*.project
-.classpath
+/.classpath
+/.settings/org.eclipse.jdt.core.prefs
 /dist
 /clover
 /classes
@@ -7,7 +8,6 @@
 /test-reports
 /test-output
 .externalToolBuilders/*
-.settings/*
 /.DS_Store
 .DS_Store
 /.com.apple.timemachine.supported
@@ -16,11 +16,17 @@ TESTNG
 /jalviewApplet.jar
 /benchmarking/lib
 *.class
-/site/
-/.settings/
-/site0/
-/sitev/
-*.class
-/site1/
-/site2/
-/site3/
+/site
+/.gradle
+/build
+/utils/HelpLinksChecker.touch
+/getdown/website
+/getdown/full_app
+/getdown/files
+/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
+*.swp
+/bin
+/doc/building.html