From 0b95d8ee876f1f8e2c445ecfdbc1abd965415e17 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Tue, 20 Sep 2022 04:41:00 -0400 Subject: [PATCH] GP-0: Fixing build broken by cb02db8313c62ed8898efbd71acfde22aee39d1e --- Ghidra/Framework/Docking/Module.manifest | 2 -- Ghidra/Framework/Docking/certification.manifest | 1 - Ghidra/Framework/Help/Module.manifest | 3 ++- Ghidra/Framework/Help/certification.manifest | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Ghidra/Framework/Docking/Module.manifest b/Ghidra/Framework/Docking/Module.manifest index a65ce961ea..e69de29bb2 100644 --- a/Ghidra/Framework/Docking/Module.manifest +++ b/Ghidra/Framework/Docking/Module.manifest @@ -1,2 +0,0 @@ -MODULE FILE LICENSE: lib/timingframework-1.0.jar BSD-3-ORACLE -MODULE FILE LICENSE: lib/javahelp-2.0.05.jar GPL 2 With Classpath Exception diff --git a/Ghidra/Framework/Docking/certification.manifest b/Ghidra/Framework/Docking/certification.manifest index 40ca041e72..0c37be739f 100644 --- a/Ghidra/Framework/Docking/certification.manifest +++ b/Ghidra/Framework/Docking/certification.manifest @@ -1,5 +1,4 @@ ##VERSION: 2.0 -##MODULE IP: BSD-3-ORACLE ##MODULE IP: Crystal Clear Icons - LGPL 2.1 ##MODULE IP: FAMFAMFAM Icons - CC 2.5 ##MODULE IP: GPL 2 With Classpath Exception diff --git a/Ghidra/Framework/Help/Module.manifest b/Ghidra/Framework/Help/Module.manifest index 8b13789179..a65ce961ea 100644 --- a/Ghidra/Framework/Help/Module.manifest +++ b/Ghidra/Framework/Help/Module.manifest @@ -1 +1,2 @@ - +MODULE FILE LICENSE: lib/timingframework-1.0.jar BSD-3-ORACLE +MODULE FILE LICENSE: lib/javahelp-2.0.05.jar GPL 2 With Classpath Exception diff --git a/Ghidra/Framework/Help/certification.manifest b/Ghidra/Framework/Help/certification.manifest index 3f4edc2be2..4eb7be75a4 100644 --- a/Ghidra/Framework/Help/certification.manifest +++ b/Ghidra/Framework/Help/certification.manifest @@ -1,3 +1,5 @@ ##VERSION: 2.0 +##MODULE IP: BSD-3-ORACLE +##MODULE IP: GPL 2 With Classpath Exception Module.manifest||GHIDRA||||END| build.files/buildLocalHelp.xml||GHIDRA||||END|