git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b5bdf8 1177dda)
Merge branch 'bug/JAL-3154tableColumnDrag' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 1 Mar 2019 11:17:11 +0000 (11:17 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 1 Mar 2019 11:17:11 +0000 (11:17 +0000)
1  2 
src/jalview/gui/FeatureSettings.java patch | diff1 | diff2 | blob | history
src/jalview/jbgui/GPreferences.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/FeatureSettings.java
Simple merge
diff --cc src/jalview/jbgui/GPreferences.java
Simple merge