Merge origin/master

build.properties

@@ -235,6 +235,7 @@ sai.simserver.dir=${examples.dir}/sai/simserver
 examples.spec.x3d.java.dir=${examples.dir}/spec/x3d/java
 
 xj3d.version=Version
+xj3d.version.number=2.2
 xj3d.version.file=${src.java.dir}/org/web3d/util/${xj3d.version}.java
 
 browser.class=${browser.classes.dir}/xj3d/browser/Xj3DBrowser.class

build.xml

@@ -1422,7 +1422,7 @@ Nearby:
             </fileset>
         </scp>
         <scp sftp="true"
-             remotetodir="${username.savage}@${scpServer.savage}:${scpDirectory.savage.Xj3D}/installers" password="${password.savage}"
+             remotetodir="${username.savage}@${scpServer.savage}:${scpDirectory.savage.Xj3D}/installers/${xj3d.version.number}" password="${password.savage}"
             trust="true" verbose="true" preserveLastModified="true">
             <fileset dir="installers">
                 <include name="README.installers.txt"/>