git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da82f3c 4c46bbe)
Merge branch 'feature/JAL-674_dssp' into features/JAL-1264_showHideAnnotations features/JAL-1264_showHideAnnotations
authorJim Procter <j.procter@dundee.ac.uk>
Thu, 16 Oct 2014 12:41:05 +0000 (13:41 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Thu, 16 Oct 2014 12:41:05 +0000 (13:41 +0100)
1  2 
src/jalview/gui/AnnotationLabels.java patch | diff1 | diff2 | blob | history
src/jalview/gui/FeatureSettings.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/AnnotationLabels.java
Simple merge
diff --cc src/jalview/gui/FeatureSettings.java
Simple merge