git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ae9207 b8c8a90)
Merge branch 'develop' into feature/JAL-2422ChimeraX
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 9 Mar 2020 15:05:32 +0000 (15:05 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 9 Mar 2020 15:05:32 +0000 (15:05 +0000)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history
src/jalview/appletgui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/Preferences.java patch | diff1 | diff2 | blob | history
src/jalview/jbgui/GPreferences.java patch | diff1 | diff2 | blob | history
src/jalview/project/Jalview2XML.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/appletgui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/Preferences.java
Simple merge
diff --cc src/jalview/jbgui/GPreferences.java
Simple merge
diff --cc src/jalview/project/Jalview2XML.java
Simple merge