git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 691783b 095d07c)
Merge branch 'feature/JAL-654_dssp' into develop
authorJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 11:47:08 +0000 (12:47 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 11:47:08 +0000 (12:47 +0100)

Trivial merge