git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7f3ed65
944fb07
)
Merge branch 'bug/JAL-2392_deadlockonpdbdisplay' into develop
author
Jim Procter
<jprocter@issues.jalview.org>
Wed, 25 Oct 2017 14:17:55 +0000
(15:17 +0100)
committer
Jim Procter
<jprocter@issues.jalview.org>
Wed, 25 Oct 2017 14:17:55 +0000
(15:17 +0100)
1
2
src/jalview/appletgui/AlignFrame.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/ext/jmol/JalviewJmolBinding.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/gui/StructureViewerBase.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/structure/StructureSelectionManager.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/ws/jws2/AbstractJabaCalcWorker.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc
src/jalview/ext/jmol/JalviewJmolBinding.java
Simple merge
diff --cc
src/jalview/gui/StructureViewerBase.java
Simple merge
diff --cc
src/jalview/structure/StructureSelectionManager.java
Simple merge
diff --cc
src/jalview/ws/jws2/AbstractJabaCalcWorker.java
Simple merge
git://source.jalview.org / jalview.git / commitdiff