git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3ca1aa 7b0ba47)
Merge remote-tracking branch 'origin/features/JAL-2814ftsHelp' into merge/JAL-2814
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 5 Mar 2019 12:01:37 +0000 (12:01 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 5 Mar 2019 12:01:37 +0000 (12:01 +0000)
1  2 
help/help.jhm patch | diff1 | diff2 | blob | history
src/jalview/gui/FeatureSettings.java patch | diff1 | diff2 | blob | history

diff --cc help/help.jhm
Simple merge
diff --cc src/jalview/gui/FeatureSettings.java
Simple merge