git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 341e759 e053bc4)
Merge branch 'bug/JAL-689' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 25 Nov 2014 21:48:20 +0000 (21:48 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 25 Nov 2014 21:48:20 +0000 (21:48 +0000)
1  2 
.classpath patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignViewport.java patch | diff1 | diff2 | blob | history

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