git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d98d7f 773945d)
Merge branch 'features/typed_annotations_calcId' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 12 Nov 2014 14:56:03 +0000 (14:56 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 12 Nov 2014 14:56:03 +0000 (14:56 +0000)

Trivial merge