git://source.jalview.org / jalview.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c920b3c 32973e4)
Merge branch 'features/JAL-1264_showHideAnnotations' into forpush/JAL-674_dssp
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 10:10:52 +0000 (11:10 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 10:10:52 +0000 (11:10 +0100)
commit57c4f810f995895293ef4a9d956dd9c9a767d41f
tree01d75dadff69bbb8c154270f64f2929ddd9bb13ctree | snapshot
parentc920b3c897f5d20d839a3fc84c2bfa097970b5d1commit | diff
parent32973e4c3a37dd4485c4190f45bbf43017af40dfcommit | diff
Merge branch 'features/JAL-1264_showHideAnnotations' into forpush/JAL-674_dssp
EOL changes conflict with new lines from mungo's branch
Conflicts:
resources/lang/Messages.properties
src/jalview/datamodel/SequenceI.java
src/jalview/datamodel/SequenceI.java diff1 | diff2 | blob | history