git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4f8935 016ed9a)
Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 2 Jun 2017 15:35:33 +0000 (16:35 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 2 Jun 2017 15:35:33 +0000 (16:35 +0100)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
src/jalview/gui/Finder.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc src/jalview/gui/Finder.java
Simple merge