git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: d5702bf)
Merge branch 'develop' into feature/JAL-2759
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 21 Nov 2017 10:27:55 +0000 (10:27 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 21 Nov 2017 10:27:55 +0000 (10:27 +0000)
Conflicts:
benchmarking/src/main/java/org/jalview/HiddenColumnsBenchmark.java
src/jalview/gui/AlignViewport.java


No differences found