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:13:50 UTC
[1/3] git commit: CB-4432 copyright notice change
Updated Branches:
refs/heads/master 0ab00b480 -> b5f24d736
CB-4432 copyright notice change
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/0857d984
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/0857d984
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/0857d984
Branch: refs/heads/master
Commit: 0857d984a8d91560eb74166aa17f072fc89eada0
Parents: b471803
Author: lorinbeer <lo...@adobe.com>
Authored: Tue Aug 20 14:28:55 2013 -0700
Committer: lorinbeer <lo...@adobe.com>
Committed: Tue Aug 20 14:28:55 2013 -0700
----------------------------------------------------------------------
src/blackberry10/index.js | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/0857d984/src/blackberry10/index.js
----------------------------------------------------------------------
diff --git a/src/blackberry10/index.js b/src/blackberry10/index.js
index 32192c8..1b9b786 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 audioObjects = {},
mediaErrorsHandled = false;
[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-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/b5f24d73
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/b5f24d73
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/b5f24d73
Branch: refs/heads/master
Commit: b5f24d736dbe9149d9ac14d7063f140d27fd2ea4
Parents: 0ab00b4 4818f9c
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Sep 6 00:17:23 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Sep 6 00:17:23 2013 -0400
----------------------------------------------------------------------
CHANGELOG.md | 25 +++++++++++++++++++++++++
plugin.xml | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[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-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/4818f9c8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/4818f9c8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/4818f9c8
Branch: refs/heads/master
Commit: 4818f9c8f2f328624b0be6141b6c619fd9129361
Parents: 0857d98
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Sep 5 23:55:26 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Sep 6 00:06:21 2013 -0400
----------------------------------------------------------------------
CHANGELOG.md | 25 +++++++++++++++++++++++++
plugin.xml | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/4818f9c8/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..cd90588
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,25 @@
+<!--
+#
+# 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
+#
+# 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.
+#
+-->
+# Release Notes
+
+
+### 0.2.1 (Sept 5, 2013)
+* CB-4432 copyright notice change
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/4818f9c8/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 1b23458..4a47225 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.core.AudioHandler"
- version="0.2.0">
+ version="0.2.1">
<name>Media</name>
<description>Cordova Media Plugin</description>
<license>Apache 2.0</license>