git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d716c9b 41bb6b9)
Merge remote-tracking branch 'origin/releases/Release_2_10_4_Branch' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 28 May 2018 08:19:40 +0000 (09:19 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 28 May 2018 08:19:40 +0000 (09:19 +0100)
Conflicts:
src/jalview/io/FeaturesFile.java

1  2 
build.xml patch | diff1 | diff2 | blob | history
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/Desktop.java patch | diff1 | diff2 | blob | history
src/jalview/io/FeaturesFile.java patch | diff1 | diff2 | blob | history
test/jalview/gui/SeqCanvasTest.java patch | diff1 | diff2 | blob | history
test/jalview/renderer/seqfeatures/FeatureRendererTest.java patch | diff1 | diff2 | blob | history

diff --cc build.xml
Simple merge
diff --cc resources/lang/Messages.properties
Simple merge
diff --cc resources/lang/Messages_es.properties
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/Desktop.java
Simple merge
diff --cc src/jalview/io/FeaturesFile.java
Simple merge
diff --cc test/jalview/gui/SeqCanvasTest.java
Simple merge