git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
af14381
de27aab
)
Merge branch 'releases/Release_2_10_4_Branch' into develop
author
Jim Procter
<jprocter@issues.jalview.org>
Tue, 20 Feb 2018 13:40:41 +0000
(13:40 +0000)
committer
Jim Procter
<jprocter@issues.jalview.org>
Tue, 20 Feb 2018 13:40:41 +0000
(13:40 +0000)
1
2
build.xml
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/gui/AlignFrame.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
build.xml
Simple merge
diff --cc
src/jalview/gui/AlignFrame.java
Simple merge