OSDN Git Service

Merge remote-tracking branch 'origin/develop' master version0.5.3
authoryuki <kimaira7@gmail.com>
Wed, 26 Nov 2014 01:37:30 +0000 (10:37 +0900)
committeryuki <kimaira7@gmail.com>
Wed, 26 Nov 2014 01:37:30 +0000 (10:37 +0900)
Conflicts:
installbuilder/installbuilder_linux.xml
installbuilder/installbuilder_mac.xml

installbuilder/installbuilder_linux.xml
installbuilder/installbuilder_mac.xml

index 32114dc..87acbdc 100755 (executable)
@@ -2,10 +2,10 @@
     <shortName>neighbornote</shortName>
     <fullName>NeighborNote</fullName>
     <version>0.5.3</version>
-    <readmeFile>C:/home/yuki/デスクトップ/NeighborNote/README.md</readmeFile>
-    <licenseFile>C:/home/yuki/デスクトップ/NeighborNote/LICENSE</licenseFile>
-    <logoImage>C:/home/yuki/デスクトップ/NeighborNote/installbuilder/installerLogo.png</logoImage>
-    <splashImage>C:/home/yuki/デスクトップ/NeighborNote/installbuilder/installerSplash.png</splashImage>
+    <readmeFile>/home/yuki/デスクトップ/NeighborNote/README.md</readmeFile>
+    <licenseFile>/home/yuki/デスクトップ/NeighborNote/LICENSE</licenseFile>
+    <logoImage>/home/yuki/デスクトップ/NeighborNote/installbuilder/installerLogo.png</logoImage>
+    <splashImage>/home/yuki/デスクトップ/NeighborNote/installbuilder/installerSplash.png</splashImage>
     <defaultLanguage>auto</defaultLanguage>
     <allowLanguageSelection>1</allowLanguageSelection>
     <componentList>
                     <platforms>all</platforms>
                     <distributionFileList>
                         <distributionDirectory>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/images</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/images</origin>
                         </distributionDirectory>
                         <distributionDirectory>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/lib</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/lib</origin>
                         </distributionDirectory>
                         <distributionDirectory>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/qss</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/qss</origin>
                         </distributionDirectory>
                         <distributionDirectory>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/spell</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/spell</origin>
                         </distributionDirectory>
                         <distributionDirectory>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/translations</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/translations</origin>
                         </distributionDirectory>
                         <distributionDirectory>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/xml</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/xml</origin>
                         </distributionDirectory>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/neighbornote.jar</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/neighbornote.jar</origin>
                         </distributionFile>
                         <distributionDirectory>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/extras</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/extras</origin>
                         </distributionDirectory>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/copyright</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/copyright</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/gpl.txt</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/gpl.txt</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/LICENSE</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/LICENSE</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/README.md</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/README.md</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/release.txt</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/release.txt</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/neighbornote.png</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/neighbornote.png</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/neighbornote.sh</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/neighbornote.sh</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/shortcuts_howto.txt</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/shortcuts_howto.txt</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/NeighborNote/shortcuts_sample.txt</origin>
+                            <origin>/home/yuki/デスクトップ/NeighborNote/shortcuts_sample.txt</origin>
                         </distributionFile>
                     </distributionFileList>
                     <shortcutList>
                     <platforms>linux-x64</platforms>
                     <distributionFileList>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/qtjambi-linux64-lgpl-4.5.2_01/qtjambi-linux64-gcc-4.5.2_01.jar</origin>
+                            <origin>/home/yuki/デスクトップ/qtjambi-linux64-lgpl-4.5.2_01/qtjambi-linux64-gcc-4.5.2_01.jar</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/qtjambi-linux64-lgpl-4.5.2_01/qtjambi-linux64-4.5.2_01.jar</origin>
+                            <origin>/home/yuki/デスクトップ/qtjambi-linux64-lgpl-4.5.2_01/qtjambi-linux64-4.5.2_01.jar</origin>
                         </distributionFile>
                     </distributionFileList>
                 </folder>
                     <platforms>linux</platforms>
                     <distributionFileList>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/qtjambi-linux32-lgpl-4.5.2_01/qtjambi-linux32-gcc-4.5.2_01.jar</origin>
+                            <origin>/home/yuki/デスクトップ/qtjambi-linux32-lgpl-4.5.2_01/qtjambi-linux32-gcc-4.5.2_01.jar</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/home/yuki/デスクトップ/qtjambi-linux32-lgpl-4.5.2_01/qtjambi-linux32-4.5.2_01.jar</origin>
+                            <origin>/home/yuki/デスクトップ/qtjambi-linux32-lgpl-4.5.2_01/qtjambi-linux32-4.5.2_01.jar</origin>
                         </distributionFile>
                     </distributionFileList>
                 </folder>
         <licenseFile>
             <code>en</code>
             <encoding>utf-8</encoding>
-            <file>C:/home/yuki/デスクトップ/NeighborNote/LICENSE</file>
+            <file>/home/yuki/デスクトップ/NeighborNote/LICENSE</file>
         </licenseFile>
     </licenseFileList>
     <parameterList>
         <readmeFile>
             <code>ja</code>
             <encoding>utf-8</encoding>
-            <file>C:/home/yuki/デスクトップ/NeighborNote/README.md</file>
+            <file>/home/yuki/デスクトップ/NeighborNote/README.md</file>
         </readmeFile>
     </readmeFileList>
 </project>
index 51cff95..7fe6545 100755 (executable)
@@ -2,10 +2,10 @@
     <shortName>neighbornote</shortName>
     <fullName>NeighborNote</fullName>
     <version>0.5.3</version>
-    <readmeFile>C:/Users/takahashi/Desktop/NeighborNote/README.md</readmeFile>
-    <licenseFile>C:/Users/takahashi/Desktop/NeighborNote/LICENSE</licenseFile>
-    <logoImage>C:/Users/takahashi/Desktop/NeighborNote/installbuilder/installerLogo.png</logoImage>
-    <splashImage>C:/Users/takahashi/Desktop/NeighborNote/installbuilder/installerSplash.png</splashImage>
+    <readmeFile>/Users/takahashi/Desktop/NeighborNote/README.md</readmeFile>
+    <licenseFile>/Users/takahashi/Desktop/NeighborNote/LICENSE</licenseFile>
+    <logoImage>/Users/takahashi/Desktop/NeighborNote/installbuilder/installerLogo.png</logoImage>
+    <splashImage>/Users/takahashi/Desktop/NeighborNote/installbuilder/installerSplash.png</splashImage>
     <defaultLanguage>auto</defaultLanguage>
     <allowLanguageSelection>1</allowLanguageSelection>
     <componentList>
                     <platforms>all</platforms>
                     <distributionFileList>
                         <distributionDirectory>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/images</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/images</origin>
                         </distributionDirectory>
                         <distributionDirectory>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/lib</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/lib</origin>
                         </distributionDirectory>
                         <distributionDirectory>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/qss</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/qss</origin>
                         </distributionDirectory>
                         <distributionDirectory>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/spell</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/spell</origin>
                         </distributionDirectory>
                         <distributionDirectory>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/translations</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/translations</origin>
                         </distributionDirectory>
                         <distributionDirectory>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/xml</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/xml</origin>
                         </distributionDirectory>
                         <distributionFile>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/neighbornote.jar</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/neighbornote.jar</origin>
                         </distributionFile>
                         <distributionDirectory>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/extras</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/extras</origin>
                         </distributionDirectory>
                         <distributionFile>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/copyright</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/copyright</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/gpl.txt</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/gpl.txt</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/LICENSE</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/LICENSE</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/README.md</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/README.md</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/release.txt</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/release.txt</origin>
                         </distributionFile>
                     </distributionFileList>
                     <shortcutList>
                     <platforms>osx</platforms>
                     <distributionFileList>
                         <distributionDirectory>
-                            <origin>C:/Users/takahashi/Desktop/NeighborNote/installbuilder/neighbornote-osx.app</origin>
+                            <origin>/Users/takahashi/Desktop/NeighborNote/installbuilder/neighbornote-osx.app</origin>
                         </distributionDirectory>
                     </distributionFileList>
                 </folder>
                     <platforms>osx</platforms>
                     <distributionFileList>
                         <distributionFile>
-                            <origin>C:/Users/takahashi/Desktop/qtjambi-mac-lgpl-4.5.2_01/qtjambi-macosx-gcc-4.5.2_01.jar</origin>
+                            <origin>/Users/takahashi/Desktop/qtjambi-mac-lgpl-4.5.2_01/qtjambi-macosx-gcc-4.5.2_01.jar</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>C:/Users/takahashi/Desktop/qtjambi-mac-lgpl-4.5.2_01/qtjambi-macosx-4.5.2_01.jar</origin>
+                            <origin>/Users/takahashi/Desktop/qtjambi-mac-lgpl-4.5.2_01/qtjambi-macosx-4.5.2_01.jar</origin>
                         </distributionFile>
                     </distributionFileList>
                 </folder>
         <licenseFile>
             <code>en</code>
             <encoding>utf-8</encoding>
-            <file>C:/Users/takahashi/Desktop/NeighborNote/LICENSE</file>
+            <file>/Users/takahashi/Desktop/NeighborNote/LICENSE</file>
         </licenseFile>
     </licenseFileList>
     <parameterList>
         <readmeFile>
             <code>ja</code>
             <encoding>utf-8</encoding>
-            <file>C:/Users/takahashi/Desktop/NeighborNote/README.md</file>
+            <file>/Users/takahashi/Desktop/NeighborNote/README.md</file>
         </readmeFile>
     </readmeFileList>
 </project>