mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-09-28 17:11:11 -09:00
Merge remote-tracking branch 'origin/GP-1288_d-millar_exceptions'
Conflicts: Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/manager/impl/DbgDebugEventCallbacksAdapter.java Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/manager/impl/DbgManagerImpl.java Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/DebuggerResources.java
This commit is contained in:
@@ -149,6 +149,7 @@ src/main/resources/images/breakpoints-enable-all.png||GHIDRA||||END|
|
||||
src/main/resources/images/breakpoints-make-effective.png||GHIDRA||||END|
|
||||
src/main/resources/images/breakpoints.png||GHIDRA||||END|
|
||||
src/main/resources/images/closedFolder.png||Modified Nuvola Icons - LGPL 2.1||||END|
|
||||
src/main/resources/images/conf.png||GHIDRA||||END|
|
||||
src/main/resources/images/connect.png||GHIDRA||||END|
|
||||
src/main/resources/images/console.png||GHIDRA||||END|
|
||||
src/main/resources/images/continue.png||GHIDRA||||END|
|
||||
@@ -177,6 +178,7 @@ src/main/resources/images/stepout.png||GHIDRA||||END|
|
||||
src/main/resources/images/stepover.png||GHIDRA||||END|
|
||||
src/main/resources/images/stop.png||GHIDRA||||END|
|
||||
src/main/resources/images/sync_enabled.png||GHIDRA||||END|
|
||||
src/main/resources/images/system-switch-user.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
|
||||
src/main/resources/images/table.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END|
|
||||
src/main/resources/images/text-xml.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
|
||||
src/main/resources/images/thread.png||GHIDRA||||END|
|
||||
|
||||
Reference in New Issue
Block a user