From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 24 May 2019 14:26:57 +0000 (+0100)
Subject: JAL-3010 commit to allow merge
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=430d4fdf141018c68c200a8bcb0484e4fc999b28;p=jalview.git

JAL-3010 commit to allow merge
---

diff --git a/.gitignore b/.gitignore
index 211ddc9..a2a64e7 100644
--- 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
@@ -17,3 +17,15 @@ TESTNG
 /benchmarking/lib
 *.class
 /site
+/.gradle
+/build
+/utils/HelpLinksChecker.out
+/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