git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfc0108 1717055)
Merge branch 'develop' into features/JAL-2393customMatrices
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 28 Apr 2017 09:07:55 +0000 (10:07 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 28 Apr 2017 09:07:55 +0000 (10:07 +0100)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
src/jalview/appletgui/AlignViewport.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignViewport.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc src/jalview/gui/AlignViewport.java
Simple merge