From 7ef81bd72a813a5b116adc50aa1ec4fe9445613d Mon Sep 17 00:00:00 2001
From: kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300>
Date: Fri, 29 Sep 2006 18:05:41 +0000
Subject: Merged dev-1_5 branch back to MAIN trunk

---
 nbproject/.cvsignore  |  1 +
 nbproject/project.xml | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 nbproject/.cvsignore

(limited to 'nbproject')

diff --git a/nbproject/.cvsignore b/nbproject/.cvsignore
new file mode 100644
index 0000000..3e18ebf
--- /dev/null
+++ b/nbproject/.cvsignore
@@ -0,0 +1 @@
+private
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 411d578..6586f04 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -4,7 +4,7 @@
     <configuration>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
             <!-- Do not use Project Properties customizer when editing this file manually. -->
-            <name>j3d-examples-1.4.0</name>
+            <name>j3d-examples-1.5.0</name>
             <properties/>
             <folders>
                 <source-folder>
@@ -21,13 +21,18 @@
                     <target>clean</target>
                 </action>
                 <action name="run">
-                    <target>run</target>
+                    <target>run.HelloUniverse</target>
                 </action>
                 <action name="rebuild">
                     <target>clean</target>
                     <target>jar</target>
                 </action>
             </ide-actions>
+            <export>
+                <type>jar</type>
+                <location>dist/j3d-examples.jar</location>
+                <build-target>jar</build-target>
+            </export>
             <view>
                 <items>
                     <source-folder style="packages">
@@ -45,12 +50,17 @@
                     <ide-action name="rebuild"/>
                 </context-menu>
             </view>
-            <subprojects/>
+            <subprojects>
+                <project>../j3d-core</project>
+                <project>../vecmath</project>
+            </subprojects>
         </general-data>
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
             <compilation-unit>
                 <package-root>src/classes</package-root>
-                <source-level>1.4</source-level>
+                <classpath mode="compile">../j3d-core/build/default/debug/lib/ext/j3dcore.jar:../j3d-core/build/default/debug/lib/ext/j3dutils.jar:../vecmath/build/debug/lib/ext/vecmath.jar</classpath>
+                <built-to>dist/j3d-examples.jar</built-to>
+                <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>
     </configuration>
-- 
cgit v1.2.3