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/08/16 18:50:35 UTC
[2/4] git commit: Merge branch 'master' into dev
Merge branch 'master' into dev
Conflicts:
plugin.xml
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/commit/8f008759
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/tree/8f008759
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/diff/8f008759
Branch: refs/heads/dev
Commit: 8f008759c14f45b646f03bb5857e53cba0826649
Parents: 4f52f79 9e52a64
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Aug 16 12:35:22 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Aug 16 12:35:22 2013 -0400
----------------------------------------------------------------------
plugin.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-globalization/blob/8f008759/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index b283011,cf82fe2..a153458
--- a/plugin.xml
+++ b/plugin.xml
@@@ -1,9 -1,12 +1,12 @@@
<?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="org.apache.cordova.core.globalization"
version="0.1.0">
- <name>globalization</name>
+ <name>Globalization</name>
+ <description>Cordova Globalization Plugin</description>
+ <license>Apache</license>
+ <keywords>cordova,globalization</keywords>
<js-module src="www/GlobalizationError.js" name="GlobalizationError">
<clobbers target="window.GlobalizationError" />