git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 536a4a9)
Merge remote-tracking branch
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Apr 2017 13:13:18 +0000 (14:13 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Apr 2017 13:13:18 +0000 (14:13 +0100)
'origin/features/JAL-2388hiddencolumnschanges' into
features/JAL-2388OverviewWindow

Conflicts:
src/jalview/appletgui/OverviewPanel.java
src/jalview/gui/OverviewPanel.java
src/jalview/viewmodel/OverviewDimensions.java


No differences found