git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 78ca38e)
Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 20 Jan 2017 11:56:07 +0000 (11:56 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 20 Jan 2017 11:56:07 +0000 (11:56 +0000)
Conflicts:
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/SliderPanel.java
src/jalview/gui/PopupMenu.java


No differences found