cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera
Date Mon, 08 Jul 2013 21:54:38 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera

Conflicts:
	plugin.xml


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/ad6b9fa3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/ad6b9fa3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/ad6b9fa3

Branch: refs/heads/master
Commit: ad6b9fa3fd75bb28b178a5488fa0343e33761a3f
Parents: c8c201b ea7bdda
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Mon Jul 8 14:53:49 2013 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Mon Jul 8 14:53:49 2013 -0700

----------------------------------------------------------------------
 docs/parameter/cameraError.md   |  2 +-
 docs/parameter/cameraSuccess.md |  2 +-
 plugin.xml                      | 22 ++++++++++++++++------
 test/camera/index.html          |  2 +-
 www/Camera.js                   |  4 ++--
 www/CameraPopoverOptions.js     |  2 +-
 6 files changed, 22 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ad6b9fa3/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index ec14190,07f4e3b..da9633c
--- a/plugin.xml
+++ b/plugin.xml
@@@ -71,7 -74,10 +74,11 @@@
              <Capability Name="ID_CAP_ISV_CAMERA" />
          </config-file>
  
 -        <source-file src="src/wp7/Camera.cs" />
 +        <source-file src="src/wp/Camera.cs" />
++
+ 
+         <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+         </js-module>
      </platform>
  
      <!-- wp8 -->
@@@ -86,7 -92,10 +93,10 @@@
              <Capability Name="ID_CAP_ISV_CAMERA" />
          </config-file>
  
 -        <source-file src="src/wp8/Camera.cs" />
 +        <source-file src="src/wp/Camera.cs" />
+ 
+         <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+         </js-module>
      </platform>
            
  </plugin>


Mime
View raw message