git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31117f8 fc9edfc)
Merge branch 'develop' into features/mchmmer
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 5 Jun 2018 07:46:09 +0000 (08:46 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 5 Jun 2018 07:46:09 +0000 (08:46 +0100)
1  2 
src/jalview/util/MapList.java patch | diff1 | diff2 | blob | history
test/jalview/util/MapListTest.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/util/MapList.java
Simple merge
diff --cc test/jalview/util/MapListTest.java
Simple merge