Merge origin/master

a29c7bd6 · Brutzman, Don · 64729762 · f73dd954 · a29c7bd6
Commit a29c7bd6 authored May 03, 2020 by Brutzman, Don
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

developers.html developers.html +5 -5

No files found.
--- a/developers.html
+++ b/developers.html
@@ -899,9 +899,9 @@ OpenJDK 64-Bit Server VM (build 14+36-1461, mixed mode, sharing)
              <pre>
 $<b> java -version</b> &nbsp;&nbsp; # Oracle JDK 14

-java version "14" 2020-03-17
-Java(TM) SE Runtime Environment (build 14+36-1461)
-Java HotSpot(TM) 64-Bit Server VM (build 14+36-1461, mixed mode, sharing)
+java 13 2019-09-17
+Java(TM) SE Runtime Environment (build 13+33)
+Java HotSpot(TM) 64-Bit Server VM (build 13+33, mixed mode, sharing)
 </pre>
          			</li>
          			<li>
@@ -2561,7 +2561,7 @@ netbeans_jdkhome="C:\Program Files\Java\jdk1.8.0_221"</pre>

      <blockquote style="background-color: palegreen">
          <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>.
          <br />
          <i>Status:</i> 
@@ -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://gitlab.nps.edu/Savage/xj3d/tree/master/jars" target="_blank">git</a>)
         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,
          improvements continue.
          <br />