You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2012/11/01 23:09:19 UTC
[38/58] [abbrv] git commit: fixes merge issues
fixes merge issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/commit/ae892d0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/tree/ae892d0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/diff/ae892d0b
Branch: refs/heads/master
Commit: ae892d0bece5e69acfad05df98495b7197c79b5f
Parents: 8b958af
Author: sgrebnov <se...@gmail.com>
Authored: Tue Oct 16 18:26:26 2012 +0400
Committer: sgrebnov <se...@gmail.com>
Committed: Tue Oct 16 18:26:26 2012 +0400
----------------------------------------------------------------------
example/CordovaExample.csproj | 3 +-
example/www/index.html | 2 +-
templates/custom/CordovaAppProj.csproj | 2 +-
templates/custom/CordovaSourceDictionary.xml | 2 +-
templates/full/CordovaAppProj.csproj | 4 +-
templates/full/CordovaSourceDictionary.xml | 4 +-
templates/full/www/img/cordova.png | Bin 19932 -> 0 bytes
templates/standalone/CordovaAppProj.csproj | 5 ++-
templates/standalone/CordovaSolution.sln | 20 +++++-----------
templates/standalone/CordovaSourceDictionary.xml | 4 +-
templates/standalone/www/img/cordova.png | Bin 19932 -> 0 bytes
11 files changed, 20 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/ae892d0b/example/CordovaExample.csproj
----------------------------------------------------------------------
diff --git a/example/CordovaExample.csproj b/example/CordovaExample.csproj
index d002061..96f6ac5 100644
--- a/example/CordovaExample.csproj
+++ b/example/CordovaExample.csproj
@@ -143,7 +143,8 @@
<Content Include="CordovaSourceDictionary.xml">
<SubType>Designer</SubType>
</Content>
- <Content Include="www\cordova-2.1.0.js" />
+ <Content Include="www\cordova-2.2.0.js" />
+ <Content Include="www\cordova-current.js" />
<Content Include="www\network.html">
<SubType>Designer</SubType>
</Content>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/ae892d0b/example/www/index.html
----------------------------------------------------------------------
diff --git a/example/www/index.html b/example/www/index.html
index 3bf8c18..5ece95f 100644
--- a/example/www/index.html
+++ b/example/www/index.html
@@ -22,7 +22,7 @@
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, maximum-scale=1.0, user-scalable=no;" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
- <title>Cordova WP7</title>
+ <title>Cordova WP</title>
<link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8"/>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/ae892d0b/templates/custom/CordovaAppProj.csproj
----------------------------------------------------------------------
diff --git a/templates/custom/CordovaAppProj.csproj b/templates/custom/CordovaAppProj.csproj
index eec0049..b2c794b 100644
--- a/templates/custom/CordovaAppProj.csproj
+++ b/templates/custom/CordovaAppProj.csproj
@@ -93,7 +93,7 @@
<ItemGroup>
<Content Include="BuildManifestProcessor.js" />
<Content Include="CordovaSourceDictionary.xml" />
- <Content Include="www\cordova-2.0.0.js" />
+ <Content Include="www\cordova-2.1.0.js" />
<Content Include="www\css\index.css" />
<Content Include="www\js\index.js" />
<Content Include="www\img\cordova.png" />
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/ae892d0b/templates/custom/CordovaSourceDictionary.xml
----------------------------------------------------------------------
diff --git a/templates/custom/CordovaSourceDictionary.xml b/templates/custom/CordovaSourceDictionary.xml
index de6c8fe..9edcba7 100644
--- a/templates/custom/CordovaSourceDictionary.xml
+++ b/templates/custom/CordovaSourceDictionary.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This file is auto-generated, do not edit! -jm -->
<CordovaSourceDictionary>
- <FilePath Value="www\cordova-2.0.0.js"/>
+ <FilePath Value="www\cordova-2.1.0.js"/>
<FilePath Value="www\index.html"/>
<FilePath Value="www\css\index.css"/>
<FilePath Value="www\img\cordova.png"/>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/ae892d0b/templates/full/CordovaAppProj.csproj
----------------------------------------------------------------------
diff --git a/templates/full/CordovaAppProj.csproj b/templates/full/CordovaAppProj.csproj
index fb06f59..d0c33f6 100644
--- a/templates/full/CordovaAppProj.csproj
+++ b/templates/full/CordovaAppProj.csproj
@@ -143,11 +143,11 @@
<ItemGroup>
<Content Include="CordovaLib\WPCordovaClassLib.dll" />
<Content Include="CordovaSourceDictionary.xml" />
+ <Content Include="www\cordova-2.2.0.js" />
+ <Content Include="www\img\logo.png" />
<Content Include="www\js\index.js" />
<None Include="BuildManifestProcessor.js" />
- <Content Include="www\cordova-2.0.0.js" />
<Content Include="www\css\index.css" />
- <Content Include="www\img\cordova.png" />
<Content Include="www\index.html">
<SubType>Designer</SubType>
</Content>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/ae892d0b/templates/full/CordovaSourceDictionary.xml
----------------------------------------------------------------------
diff --git a/templates/full/CordovaSourceDictionary.xml b/templates/full/CordovaSourceDictionary.xml
index e2ed22f..0658088 100644
--- a/templates/full/CordovaSourceDictionary.xml
+++ b/templates/full/CordovaSourceDictionary.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This file is auto-generated, do not edit! -jm -->
<CordovaSourceDictionary>
+ <FilePath Value="www\cordova-2.2.0.js"/>
+ <FilePath Value="www\img\logo.png"/>
<FilePath Value="www\js\index.js"/>
- <FilePath Value="www\cordova-2.1.0.js"/>
<FilePath Value="www\css\index.css"/>
- <FilePath Value="www\img\cordova.png"/>
<FilePath Value="www\index.html"/>
</CordovaSourceDictionary>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/ae892d0b/templates/full/www/img/cordova.png
----------------------------------------------------------------------
diff --git a/templates/full/www/img/cordova.png b/templates/full/www/img/cordova.png
deleted file mode 100644
index e8169cf..0000000
Binary files a/templates/full/www/img/cordova.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/ae892d0b/templates/standalone/CordovaAppProj.csproj
----------------------------------------------------------------------
diff --git a/templates/standalone/CordovaAppProj.csproj b/templates/standalone/CordovaAppProj.csproj
index 89b4672..54df1ff 100644
--- a/templates/standalone/CordovaAppProj.csproj
+++ b/templates/standalone/CordovaAppProj.csproj
@@ -205,6 +205,9 @@
</Page>
</ItemGroup>
<ItemGroup>
+ <Content Include="resources\notification-beep.wav" />
+ <Content Include="www\cordova-2.2.0.js" />
+ <Content Include="www\img\logo.png" />
<Content Include="www\js\index.js" />
<None Include="VERSION" />
<Resource Include="cordovalib\Images\appbar.back.rest.png" />
@@ -218,9 +221,7 @@
<SubType>Designer</SubType>
</Content>
<None Include="BuildManifestProcessor.js" />
- <Content Include="www\cordova-2.0.0.js" />
<Content Include="www\css\index.css" />
- <Content Include="www\img\cordova.png" />
<Content Include="www\index.html">
<SubType>Designer</SubType>
</Content>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/ae892d0b/templates/standalone/CordovaSolution.sln
----------------------------------------------------------------------
diff --git a/templates/standalone/CordovaSolution.sln b/templates/standalone/CordovaSolution.sln
index ed73b21..58c0e62 100644
--- a/templates/standalone/CordovaSolution.sln
+++ b/templates/standalone/CordovaSolution.sln
@@ -5,32 +5,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CordovaAppProj", "CordovaAp
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|ARM = Debug|ARM
Debug|Any CPU = Debug|Any CPU
+ Debug|ARM = Debug|ARM
Debug|x86 = Debug|x86
- Release|ARM = Release|ARM
Release|Any CPU = Release|Any CPU
+ Release|ARM = Release|ARM
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Debug|ARM.ActiveCfg = Debug|ARM
- {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Debug|ARM.Build.0 = Debug|ARM
- {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Debug|ARM.Deploy.0 = Debug|ARM
{3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
- {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Debug|x86.ActiveCfg = Debug|x86
- {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Debug|x86.Build.0 = Debug|x86
- {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Debug|x86.Deploy.0 = Debug|x86
- {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Release|ARM.ActiveCfg = Release|ARM
- {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Release|ARM.Build.0 = Release|ARM
- {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Release|ARM.Deploy.0 = Release|ARM
+ {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Debug|x86.ActiveCfg = Debug|Any CPU
{3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Release|Any CPU.Build.0 = Release|Any CPU
{3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Release|Any CPU.Deploy.0 = Release|Any CPU
- {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Release|x86.ActiveCfg = Release|x86
- {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Release|x86.Build.0 = Release|x86
- {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Release|x86.Deploy.0 = Release|x86
+ {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Release|ARM.ActiveCfg = Release|Any CPU
+ {3677C1B7-D68B-4CF9-BF8A-E869D437A6DF}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/ae892d0b/templates/standalone/CordovaSourceDictionary.xml
----------------------------------------------------------------------
diff --git a/templates/standalone/CordovaSourceDictionary.xml b/templates/standalone/CordovaSourceDictionary.xml
index 19fcfd0..97a48aa 100644
--- a/templates/standalone/CordovaSourceDictionary.xml
+++ b/templates/standalone/CordovaSourceDictionary.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This file is auto-generated, do not edit! -jm -->
<CordovaSourceDictionary>
- <FilePath Value="www\img\logo.png"/>
<FilePath Value="www\js\index.js"/>
- <FilePath Value="www\cordova-2.1.0.js"/>
+ <FilePath Value="www\cordova-2.0.0.js"/>
<FilePath Value="www\css\index.css"/>
+ <FilePath Value="www\img\cordova.png"/>
<FilePath Value="www\index.html"/>
</CordovaSourceDictionary>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/ae892d0b/templates/standalone/www/img/cordova.png
----------------------------------------------------------------------
diff --git a/templates/standalone/www/img/cordova.png b/templates/standalone/www/img/cordova.png
deleted file mode 100644
index e8169cf..0000000
Binary files a/templates/standalone/www/img/cordova.png and /dev/null differ