cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [3/7] git commit: Merge branch 'master' into dev
Date Fri, 28 Feb 2014 21:36:18 GMT
Merge branch 'master' into dev

Conflicts:
	RELEASENOTES.md
	plugin.xml


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/9b7c4606
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/9b7c4606
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/9b7c4606

Branch: refs/heads/dev
Commit: 9b7c46062c2cbda79da0478e15a86201fdb3b751
Parents: a92826d 2634912
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Thu Feb 27 12:02:00 2014 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Thu Feb 27 12:02:00 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/9b7c4606/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index e2adf14,07c6ad5..762c652
--- a/plugin.xml
+++ b/plugin.xml
@@@ -3,7 -3,7 +3,8 @@@
  <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
  xmlns:android="http://schemas.android.com/apk/res/android"
  id="org.apache.cordova.media"
 -    version="0.2.8">
 +    version="0.2.9">
++
      <name>Media</name>
      <description>Cordova Media Plugin</description>
      <license>Apache 2.0</license>


Mime
View raw message