You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/09/06 07:11:42 UTC

[1/3] git commit: [CB-4432] copyright notice change

Updated Branches:
  refs/heads/master 8392d314d -> 0034add9f


[CB-4432] copyright notice change


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status/commit/17f9b43b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status/tree/17f9b43b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status/diff/17f9b43b

Branch: refs/heads/master
Commit: 17f9b43b7c79beeea3e40e695625606fd6460697
Parents: 6194de4
Author: lorinbeer <lo...@adobe.com>
Authored: Tue Aug 20 13:50:49 2013 -0700
Committer: lorinbeer <lo...@adobe.com>
Committed: Tue Aug 20 13:51:25 2013 -0700

----------------------------------------------------------------------
 src/blackberry10/index.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status/blob/17f9b43b/src/blackberry10/index.js
----------------------------------------------------------------------
diff --git a/src/blackberry10/index.js b/src/blackberry10/index.js
index 4d3816f..f757ee7 100644
--- a/src/blackberry10/index.js
+++ b/src/blackberry10/index.js
@@ -1,18 +1,23 @@
 /*
- * Copyright 2010-2011 Research In Motion Limited.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
 
     var _clientListeners = {},
         _webkitBattery = navigator.webkitBattery || navigator.battery;


[2/3] git commit: [CB-4752] Updated version and changelog

Posted by ag...@apache.org.
[CB-4752] Updated version and changelog


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

Branch: refs/heads/master
Commit: d218f0af80708127f6398996f795c8a25f524076
Parents: 17f9b43
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Sep 5 23:52:55 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Sep 5 23:52:55 2013 -0400

----------------------------------------------------------------------
 plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status/blob/d218f0af/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 2f81aea..a5e6068 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
       id="org.apache.cordova.core.battery-status"
-      version="0.2.0">
+      version="0.2.1">
     <name>Battery</name>
     <description>Cordova Battery Plugin</description>
     <license>Apache 2.0</license>


[3/3] git commit: Merge branch 'dev'

Posted by ag...@apache.org.
Merge branch 'dev'


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status/commit/0034add9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status/tree/0034add9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-battery-status/diff/0034add9

Branch: refs/heads/master
Commit: 0034add9f99f26eba4be0519db849b045d74afa2
Parents: 8392d31 d218f0a
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Sep 6 01:09:43 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Sep 6 01:09:43 2013 -0400

----------------------------------------------------------------------
 plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------