git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a04478 9b5106c)
Merge remote-tracking branch 'origin/bug/JAL-2839findWithHidden' into merge/JAL-2839_2933
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 5 Mar 2019 12:40:08 +0000 (12:40 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 5 Mar 2019 12:40:08 +0000 (12:40 +0000)
1  2 
src/jalview/datamodel/SearchResults.java patch | diff1 | diff2 | blob | history
src/jalview/datamodel/SequenceI.java patch | diff1 | diff2 | blob | history
src/jalview/gui/IdPanel.java patch | diff1 | diff2 | blob | history
test/jalview/controller/AlignViewControllerTest.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/datamodel/SequenceI.java
Simple merge
diff --cc src/jalview/gui/IdPanel.java
Simple merge