git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35bef71 b881071)
merge commit
authorCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 25 Nov 2014 17:49:58 +0000 (17:49 +0000)
committerCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 25 Nov 2014 17:49:58 +0000 (17:49 +0000)
1  2 
.classpath patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignViewport.java patch | diff1 | diff2 | blob | history
src/jalview/gui/FeatureSettings.java patch | diff1 | diff2 | blob | history
src/jalview/gui/SeqPanel.java patch | diff1 | diff2 | blob | history

diff --cc .classpath
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/AlignViewport.java
Simple merge
diff --cc src/jalview/gui/FeatureSettings.java
Simple merge
diff --cc src/jalview/gui/SeqPanel.java
Simple merge