git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a18b80e 04d19d4)
Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 15 May 2017 10:59:29 +0000 (11:59 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 15 May 2017 10:59:29 +0000 (11:59 +0100)
Conflicts:
src/jalview/gui/OverviewPanel.java

1  2 
src/jalview/appletgui/SeqPanel.java patch | diff1 | diff2 | blob | history
src/jalview/io/JSONFile.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/appletgui/SeqPanel.java
Simple merge
diff --cc src/jalview/io/JSONFile.java
Simple merge