git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8683aa 5e922f6)
Merge branch 'task/JAL-3247_JAL-3246_JAL-3254_JAL-3236_merge' into task/JAL-3141_JAL...
authorBen Soares <bsoares@dundee.ac.uk>
Mon, 27 May 2019 15:06:02 +0000 (16:06 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Mon, 27 May 2019 15:06:02 +0000 (16:06 +0100)
merge attempt

1  2 
src/jalview/gui/APQHandlers.java patch | diff1 | diff2 | blob | history
src/jalview/gui/Desktop.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/APQHandlers.java
Simple merge
diff --cc src/jalview/gui/Desktop.java
Simple merge