Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-16 15:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

GT-2763 - Table Sorting - fix merge error

Browse Source
This commit is contained in:
dragonmacher 2019-05-09 10:24:34 -04:00
parent aa8dc6a491
commit fa80baf0fb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/SettingsDialog.java
View File

@ -27,11 +27,10 @@ import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellEditor;
import docking.DialogComponentProvider;
import docking.DockingWindowManager;<<<<<<<Upstream,based on origin/master
import docking.DockingWindowManager;
import docking.widgets.checkbox.GCheckBox;
import docking.widgets.combobox.GComboBox;
import docking.widgets.table.DefaultSortedTableModel;=======
import docking.widgets.table.AbstractSortedTableModel;>>>>>>>000543e GT-2763-Table Sorting-updated help;removed old DefaultSortedTableModel
import docking.widgets.table.AbstractSortedTableModel;
import docking.widgets.table.GTable;
import ghidra.docking.settings.*;
import ghidra.util.HelpLocation;