yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GT-3302-dragonmacher-front-end-ui-lockup'

Conflicts:
	Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypeManagerPlugin.java
This commit is contained in:
Ryan Kurtz 2019-12-19 15:30:21 -05:00
commit cf4328bda4
26 changed files with 211 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/test/FrontEndTestEnv.java
View file

@ -379,7 +379,7 @@ public class FrontEndTestEnv {
if (exclusive) {
JCheckBox cb = AbstractDockingTest.findComponent(dialog, JCheckBox.class);
assertNotNull(cb);
assertEquals("Request exclusive check out", cb.getText());
assertEquals("Request exclusive checkout", cb.getText());
runSwing(() -> cb.setSelected(true));
}