yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-1592_dev747368_gnu_debugdata--SQUASHED'

Conflicts:
	Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfHeader.java
This commit is contained in:
ghidra1 2021-12-15 17:21:20 -05:00
commit 7ed911569a
3 changed files with 68 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ghidra/Framework/Project/Module.manifest
View file

@ -1 +1,2 @@
MODULE FILE LICENSE: lib/commons-compress-1.19.jar Apache License 2.0
MODULE FILE LICENSE: lib/xz-1.9.jar Public Domain

1
Ghidra/Framework/Project/build.gradle
View file

@ -31,5 +31,6 @@ dependencies {
testImplementation project(path: ':Generic', configuration: 'testArtifacts')
api "org.apache.commons:commons-compress:1.19"
api "org.tukaani:xz:1.9"
}