cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [39/58] [abbrv] git commit: Merge remote-tracking branch 'sgrebnov-wp7/master'
Date Thu, 01 Nov 2012 22:09:19 GMT
Merge remote-tracking branch 'sgrebnov-wp7/master'

Conflicts:
	example/www/cordova-2.2.0.js
	example/www/index.html
	framework/Properties/AssemblyInfo.cs
	templates/full/CordovaAppProj.csproj
	templates/full/www/cordova-2.2.0.js
	templates/standalone/CordovaAppProj.csproj
	templates/standalone/cordovalib/Commands/Contacts.cs
	templates/standalone/cordovalib/UI/AudioCaptureTask.cs
	templates/standalone/cordovalib/UI/VideoCaptureTask.cs
	templates/standalone/www/cordova-2.2.0.js


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/8b958af0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/tree/8b958af0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/diff/8b958af0

Branch: refs/heads/master
Commit: 8b958af02247ac9898993b691515fd5d3f68f964
Parents: 53e2efe 35a91b2
Author: sgrebnov <sergei.grebnov@gmail.com>
Authored: Tue Oct 16 18:24:46 2012 +0400
Committer: sgrebnov <sergei.grebnov@gmail.com>
Committed: Tue Oct 16 18:24:46 2012 +0400

----------------------------------------------------------------------
 bin/create.bat                                     |   17 +
 example/CordovaSourceDictionary.xml                |    3 +-
 example/www/accelerometer.html                     |    2 +-
 example/www/accelerometer2.html                    |    2 +-
 example/www/audio.html                             |    2 +-
 example/www/calculator.html                        |    2 +-
 example/www/camera.html                            |    2 +-
 example/www/capture.html                           |    2 +-
 example/www/compass.html                           |    2 +-
 example/www/contacts.html                          |    2 +-
 example/www/cordova-2.1.0.js                       | 6125 ---------------
 example/www/cordova-2.2.0.js                       | 6125 +++++++++++++++
 example/www/cordova-current.js                     |   19 +
 example/www/events.html                            |    2 +-
 example/www/file.html                              |    2 +-
 example/www/index.html                             |    4 +-
 example/www/location.html                          |    2 +-
 example/www/master.css                             |   19 +
 example/www/network.html                           |    2 +-
 example/www/notification.html                      |    2 +-
 example/www/storage.html                           |    2 +-
 framework/Properties/AssemblyInfo.cs               |    6 +-
 templates/description.txt                          |    2 +-
 templates/full/www/cordova-2.1.0.js                | 6125 ---------------
 templates/full/www/cordova-2.2.0.js                | 6125 +++++++++++++++
 templates/full/www/index.html                      |   20 +-
 .../standalone/cordovalib/Commands/AudioPlayer.cs  |    7 +-
 .../standalone/cordovalib/Commands/Contacts.cs     |   80 +-
 templates/standalone/cordovalib/Commands/Device.cs |    2 +-
 templates/standalone/cordovalib/Commands/File.cs   |   10 +-
 templates/standalone/www/cordova-2.1.0.js          | 6125 ---------------
 templates/standalone/www/cordova-2.2.0.js          | 6125 +++++++++++++++
 templates/standalone/www/index.html                |   20 +-
 33 files changed, 18541 insertions(+), 18446 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/8b958af0/example/www/accelerometer.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/8b958af0/example/www/audio.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/8b958af0/example/www/calculator.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/8b958af0/example/www/camera.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/8b958af0/example/www/capture.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/8b958af0/example/www/compass.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp8/blob/8b958af0/example/www/contacts.html
----------------------------------------------------------------------


Mime
View raw message