git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5c8a36 1413ed2)
Merge branch 'develop' into trialMerge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Jun 2019 14:10:48 +0000 (15:10 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Jun 2019 14:10:48 +0000 (15:10 +0100)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history
src/jalview/bin/Jalview.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/FeatureTypeSettings.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc resources/lang/Messages_es.properties
Simple merge
diff --cc src/jalview/bin/Jalview.java
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge