git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
d10280f
)
Merge remote-tracking branch 'origin/merge/JAL-845_JAL-1640' into
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 12 Feb 2015 09:33:05 +0000
(09:33 +0000)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 12 Feb 2015 09:33:05 +0000
(09:33 +0000)
features/JAL-845splitPaneMergeDevelop
Conflicts:
src/jalview/gui/Desktop.java
No differences found