cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [2/2] git commit: fixed merge issue
Date Mon, 18 Nov 2013 19:10:40 GMT
fixed merge issue


Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/7ca43cc3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/7ca43cc3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/7ca43cc3

Branch: refs/heads/master
Commit: 7ca43cc3ef7e4a42ef7aa4382973a079fe2ba47f
Parents: b63791f 332f7c0
Author: Steven Gill <stevengill97@gmail.com>
Authored: Mon Nov 18 11:10:29 2013 -0800
Committer: Steven Gill <stevengill97@gmail.com>
Committed: Mon Nov 18 11:10:29 2013 -0800

----------------------------------------------------------------------
 NOTICE         |  4 ++--
 README.md      |  4 ++++
 bin/DISCLAIMER |  8 --------
 coho           | 40 +++++++++++++++++++++-------------------
 4 files changed, 27 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/7ca43cc3/coho
----------------------------------------------------------------------
diff --cc coho
index 7d63aeb,3b4197b..7aa441c
--- a/coho
+++ b/coho
@@@ -282,7 -263,11 +282,12 @@@ var pluginRepos = 
          id: 'plugin-vibration',
          repoName: 'cordova-plugin-vibration',
          jiraComponentName: 'Plugin Vibration',
 +        inactive: true
+     }, {
+         title: 'Plugins - Other',
+         id: 'cordova-plugins',
+         repoName: 'cordova-plugins',
+         jiraComponentName: 'Plugins',
      }
  ];
  


Mime
View raw message