Skip to content
Snippets Groups Projects
Commit a29c7bd6 authored by Brutzman, Don's avatar Brutzman, Don
Browse files

Merge origin/master

parents 64729762 f73dd954
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 5 deletions
developers.html
+ 5
− 5
View file @ a29c7bd6
...@@ -899,9 +899,9 @@ OpenJDK 64-Bit Server VM (build 14+36-1461, mixed mode, sharing) ...@@ -899,9 +899,9 @@ OpenJDK 64-Bit Server VM (build 14+36-1461, mixed mode, sharing)
<pre> <pre>
$<b> java -version</b> &nbsp;&nbsp; # Oracle JDK 14 $<b> java -version</b> &nbsp;&nbsp; # Oracle JDK 14
java version "14" 2020-03-17 java 13 2019-09-17
Java(TM) SE Runtime Environment (build 14+36-1461) Java(TM) SE Runtime Environment (build 13+33)
Java HotSpot(TM) 64-Bit Server VM (build 14+36-1461, mixed mode, sharing) Java HotSpot(TM) 64-Bit Server VM (build 13+33, mixed mode, sharing)
</pre> </pre>
</li> </li>
<li> <li>
...@@ -2561,7 +2561,7 @@ netbeans_jdkhome="C:\Program Files\Java\jdk1.8.0_221"</pre> ...@@ -2561,7 +2561,7 @@ netbeans_jdkhome="C:\Program Files\Java\jdk1.8.0_221"</pre>
<blockquote style="background-color: palegreen"> <blockquote style="background-color: palegreen">
<i>Updated!</i> <i>Updated!</i>
Xj3D is upgraded to latest Java 13 (OpenJDK&nbsp;13) and moved to Xj3D is upgraded to latest Java 14 (OpenJDK&nbsp;14) and moved to
<a href="https://gitlab.nps.edu/Savage/xj3d" target="_blank">https://gitlab.nps.edu/Savage/xj3d</a>. <a href="https://gitlab.nps.edu/Savage/xj3d" target="_blank">https://gitlab.nps.edu/Savage/xj3d</a>.
<br /> <br />
<i>Status:</i> <i>Status:</i>
...@@ -2569,7 +2569,7 @@ netbeans_jdkhome="C:\Program Files\Java\jdk1.8.0_221"</pre> ...@@ -2569,7 +2569,7 @@ netbeans_jdkhome="C:\Program Files\Java\jdk1.8.0_221"</pre>
<a href=" https://savage.nps.edu/Xj3D.nps/jars" target="_blank">.jars</a> <a href=" https://savage.nps.edu/Xj3D.nps/jars" target="_blank">.jars</a>
(<a href="https://gitlab.nps.edu/Savage/xj3d/tree/master/jars" target="_blank">git</a>) (<a href="https://gitlab.nps.edu/Savage/xj3d/tree/master/jars" target="_blank">git</a>)
and and
<a href="https://gitlab.nps.edu/Savage/xj3d/tree/master/installers" target="_blank">installers</a> <a href="https://savage.nps.edu/Xj3D.nps/installers" target="_blank">installers</a>
are available, are available,
improvements continue. improvements continue.
<br /> <br />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment