git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e51f922 f877093)
Merge branch 'develop' into feature/JAL-3187linkedFeatures
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 10 Jul 2019 16:03:42 +0000 (17:03 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 10 Jul 2019 16:03:42 +0000 (17:03 +0100)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history
src/jalview/gui/CrossRefAction.java patch | diff1 | diff2 | blob | history
test/jalview/gui/AlignFrameTest.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/gui/CrossRefAction.java
Simple merge
diff --cc test/jalview/gui/AlignFrameTest.java
Simple merge