git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
26ce175
3ee1b42
)
Merge branch 'develop' into Release_2_9_0b1_Branch
author
Jim Procter
<jprocter@issues.jalview.org>
Mon, 5 Oct 2015 12:03:44 +0000
(13:03 +0100)
committer
Jim Procter
<jprocter@issues.jalview.org>
Mon, 5 Oct 2015 12:03:44 +0000
(13:03 +0100)
JAL-1894 update release branch from develop
29 files changed:
1
2
examples/appletParameters.html
patch
|
diff1
|
diff2
|
blob
|
history
examples/applets.html
patch
|
diff1
|
diff2
|
blob
|
history
examples/exampleFeatures.txt
patch
|
diff1
|
diff2
|
blob
|
history
help/html/features/columnFilterByAnnotation.html
patch
|
diff1
|
diff2
|
blob
|
history
help/html/releases.html
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/api/ComplexAlignFile.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/appletgui/AlignFrame.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/appletgui/AlignViewport.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/appletgui/CutAndPasteTransfer.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/gui/AlignViewport.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/gui/AlignmentPanel.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/gui/AppJmol.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/gui/CutAndPasteTransfer.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/gui/Desktop.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/gui/Jalview2XML.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/gui/SeqPanel.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/gui/SplitFrame.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/io/FeaturesFile.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/io/FileLoader.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/io/HtmlFile.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/io/HtmlSvgOutput.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/io/IdentifyFile.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/io/JSONFile.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/jbgui/GSplitFrame.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/util/ParseHtmlBodyAndLinks.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/ws/jws1/SeqSearchWSThread.java
patch
|
diff1
|
diff2
|
blob
|
history
test/jalview/io/JSONFileTest.java
patch
|
diff1
|
diff2
|
blob
|
history
test/jalview/ws/dbsources/PDBRestClientTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
examples/appletParameters.html
Simple merge
diff --cc
examples/applets.html
Simple merge
diff --cc
examples/exampleFeatures.txt
Simple merge
diff --cc
help/html/features/columnFilterByAnnotation.html
Simple merge
diff --cc
help/html/releases.html
Simple merge
diff --cc
src/jalview/api/ComplexAlignFile.java
Simple merge
diff --cc
src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc
src/jalview/appletgui/AlignViewport.java
Simple merge
diff --cc
src/jalview/appletgui/CutAndPasteTransfer.java
Simple merge
diff --cc
src/jalview/gui/AlignViewport.java
Simple merge
diff --cc
src/jalview/gui/AlignmentPanel.java
Simple merge
diff --cc
src/jalview/gui/AppJmol.java
Simple merge
diff --cc
src/jalview/gui/CutAndPasteTransfer.java
Simple merge
diff --cc
src/jalview/gui/Desktop.java
Simple merge
diff --cc
src/jalview/gui/Jalview2XML.java
Simple merge
diff --cc
src/jalview/gui/SeqPanel.java
Simple merge
diff --cc
src/jalview/gui/SplitFrame.java
Simple merge
diff --cc
src/jalview/io/FeaturesFile.java
Simple merge
diff --cc
src/jalview/io/FileLoader.java
Simple merge
diff --cc
src/jalview/io/HtmlFile.java
Simple merge
diff --cc
src/jalview/io/HtmlSvgOutput.java
Simple merge
diff --cc
src/jalview/io/IdentifyFile.java
Simple merge
diff --cc
src/jalview/io/JSONFile.java
Simple merge
diff --cc
src/jalview/jbgui/GSplitFrame.java
Simple merge
diff --cc
src/jalview/util/ParseHtmlBodyAndLinks.java
Simple merge
diff --cc
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
Simple merge
diff --cc
src/jalview/ws/jws1/SeqSearchWSThread.java
Simple merge
diff --cc
test/jalview/io/JSONFileTest.java
Simple merge
diff --cc
test/jalview/ws/dbsources/PDBRestClientTest.java
Simple merge