mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-04 02:09:44 +02:00
Merge branch 'GT-3362_ryanmkurtz_PR-1287_astrelsky_DocumentationFixes'
Conflicts: Ghidra/Framework/Docking/src/main/java/docking/action/DockingAction.java
This commit is contained in:
commit
6e6bdffe86
659 changed files with 1740 additions and 4136 deletions
|
@ -20,7 +20,7 @@ import java.nio.file.Path;
|
|||
import help.validator.LinkDatabase;
|
||||
|
||||
/**
|
||||
* A representation of the <tocdef> tag, which is a way to define a TOC item entry in
|
||||
* A representation of the {@literal <tocdef>} tag, which is a way to define a TOC item entry in
|
||||
* a TOC_Source.xml file.
|
||||
*/
|
||||
public class TOCItemDefinition extends TOCItem {
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
/* ###
|
||||
* IP: GHIDRA
|
||||
* REVIEWED: YES
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -21,7 +20,7 @@ import help.validator.LinkDatabase;
|
|||
import java.nio.file.Path;
|
||||
|
||||
/**
|
||||
* A representation of the <tocref> tag, which is a way to reference a TOC item entry in
|
||||
* A representation of the {@literal <tocref>} tag, which is a way to reference a TOC item entry in
|
||||
* a TOC_Source.xml file other than the one in which the reference lives.
|
||||
*/
|
||||
public class TOCItemReference extends TOCItem implements Comparable<TOCItemReference> {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue