git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccebd46 86b84a5)
Merge branch 'develop' into features/mchmmer
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 28 May 2018 08:56:14 +0000 (09:56 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 28 May 2018 08:56:14 +0000 (09:56 +0100)
Conflicts:
src/jalview/bin/Jalview.java

1  2 
help/help.jhm 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/bin/Jalview.java 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/AlignFile.java patch | diff1 | diff2 | blob | history
src/jalview/jbgui/GPreferences.java patch | diff1 | diff2 | blob | history

diff --cc help/help.jhm
Simple merge
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
diff --cc src/jalview/gui/Desktop.java
Simple merge
diff --cc src/jalview/io/AlignFile.java
Simple merge
diff --cc src/jalview/jbgui/GPreferences.java
Simple merge