[バックアップ]nyartoolkit

QTモジュールマージ作業
プロジェクトファイルの名前衝突修正

git-svn-id: http://svn.sourceforge.jp/svnroot/nyartoolkit/NyARToolkit@114 7cac0a50-4618-4814-88d0-24b83990f816

diff --git a/trunk/sample/java3d/.classpath b/trunk/sample/java3d/.classpath
index 6395e96..c862de1 100644 (file)
--- a/trunk/sample/java3d/.classpath
+++ b/trunk/sample/java3d/.classpath
@@ -9,5 +9,5 @@
        <classpathentry path="/NyARToolKit" combineaccessrules="false" kind="src"/>\r
        <classpathentry path="/NyARToolkit.utils.jmf" combineaccessrules="false" kind="src"/>\r
        <classpathentry path="/NyARToolkit.utils.java3d" combineaccessrules="false" kind="src"/>\r
-       <classpathentry path="bin" kind="output"/>\r
+       <classpathentry path="" kind="output"/>\r
 </classpath>\r

diff --git a/trunk/sample/java3d/.project b/trunk/sample/java3d/.project
index 71300e9..35755d8 100644 (file)
--- a/trunk/sample/java3d/.project
+++ b/trunk/sample/java3d/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
-       <name>NyARJava3D</name>\r
+       <name>NyARToolkit.sample.java3d</name>\r
        <comment></comment>\r
        <projects>\r
        </projects>\r

diff --git a/trunk/sample/jmf/.project b/trunk/sample/jmf/.project
index 12236e7..bdf574b 100644 (file)
--- a/trunk/sample/jmf/.project
+++ b/trunk/sample/jmf/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
-       <name>NyARToolkit.utils.jmf</name>\r
+       <name>NyARToolkit.sample.jmf</name>\r
        <comment></comment>\r
        <projects>\r
                <project>NyARToolKit</project>\r

diff --git a/trunk/sample/jogl/.project b/trunk/sample/jogl/.project
index c9e086a..c36eee5 100644 (file)
--- a/trunk/sample/jogl/.project
+++ b/trunk/sample/jogl/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
-       <name>NyARJOGL</name>\r
+       <name>NyARToolkit.sample.jogl</name>\r
        <comment></comment>\r
        <projects>\r
        </projects>\r