Merge branch 'feature/JAL-2613' into feature/JAL-2611
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 14 Jul 2017 09:01:25 +0000 (10:01 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 14 Jul 2017 09:01:25 +0000 (10:01 +0100)
Conflicts:
src/jalview/viewmodel/OverviewDimensions.java


No differences found