git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0949e25 0ebcbfc)
Merge branch 'develop' into Jalview-BH/JAL-3026
authorJim Procter <jprocter@issues.jalview.org>
Wed, 18 Jul 2018 14:40:55 +0000 (15:40 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 18 Jul 2018 14:40:55 +0000 (15:40 +0100)
clover artefacts added to gitignore. nb - .classpath is now ignored - may need to be redacted

1  2 
.gitignore patch | diff1 | diff2 | blob | history
build.xml patch | diff1 | diff2 | blob | history

diff --cc .gitignore
index aab4480,86637df..0567460
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -13,8 -14,3 +14,9 @@@ TESTN
  /jalviewApplet.jar
  /benchmarking/lib
  *.class
 +/site/
 +/.settings/
 +/site0/
 +/sitev/
 +/.classpath
++*.class
diff --cc build.xml
Simple merge