git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f35dfec
)
Updated to match develop to allow merge
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 23 May 2019 10:06:40 +0000
(11:06 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 23 May 2019 10:06:40 +0000
(11:06 +0100)
.gitignore
patch
|
blob
|
history
diff --git
a/.gitignore
b/.gitignore
index
f59eab3
..
a2a64e7
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,5
+1,6
@@
/*.project
/*.project
-.classpath
+/.classpath
+/.settings/org.eclipse.jdt.core.prefs
/dist
/clover
/classes
/dist
/clover
/classes
@@
-7,7
+8,6
@@
/test-reports
/test-output
.externalToolBuilders/*
/test-reports
/test-output
.externalToolBuilders/*
-.settings/*
/.DS_Store
.DS_Store
/.com.apple.timemachine.supported
/.DS_Store
.DS_Store
/.com.apple.timemachine.supported
@@
-16,11
+16,16
@@
TESTNG
/jalviewApplet.jar
/benchmarking/lib
*.class
/jalviewApplet.jar
/benchmarking/lib
*.class
-/site/
-/.settings/
-/site0/
-/sitev/
-*.class
-/site1/
-/site2/
-/site3/
+/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