git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6e52867
9d40dad
)
Merge remote-tracking branch
bug/JAL-2436featureRendererThreading
author
kiramt
<k.mourao@dundee.ac.uk>
Wed, 22 Mar 2017 13:53:57 +0000
(13:53 +0000)
committer
kiramt
<k.mourao@dundee.ac.uk>
Wed, 22 Mar 2017 13:53:57 +0000
(13:53 +0000)
'origin/bug/JAL-2436featureRendererThreading' into develop
Conflicts:
src/jalview/appletgui/OverviewPanel.java
src/jalview/gui/OverviewPanel.java
Trivial merge
git://source.jalview.org / jalview.git / commitdiff