git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: ca0a70b)
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Jan 2017 13:31:55 +0000 (13:31 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Jan 2017 13:31:55 +0000 (13:31 +0000)
Conflicts:
src/jalview/gui/PopupMenu.java
src/jalview/jbgui/GAlignFrame.java


No differences found