Merge remote-tracking branch 'origin/patch'

Conflicts:
	Ghidra/application.properties
This commit is contained in:
Ryan Kurtz 2022-11-03 00:50:32 -04:00
commit cee6efb6e5

View file

@ -322,7 +322,7 @@ Ghidra release includes native binaries for the following platforms:</p>
system:</p>
<ul>
<li>A <a href="#Requirements">supported</a> version of a Java Development Kit</li>
<li><a href="https://gradle.org/releases/">Gradle 6.8+ or 7.x</a></li>
<li><a href="https://gradle.org/releases/">Gradle 7.3+</a></li>
<li>make, gcc, and g++ (Linux/macOS-only)</li>
<li>
<a href="https://visualstudio.microsoft.com/vs/community/">Microsoft Visual Studio</a>