cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [2/6] git commit: merge conflight
Date Mon, 28 Oct 2013 22:13:48 GMT
merge conflight


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/commit/1f561023
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/tree/1f561023
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/diff/1f561023

Branch: refs/heads/dev
Commit: 1f56102372d4dbe5bada1a431ea7d813d5a4f421
Parents: 6de2549 1b79810
Author: Steven Gill <stevengill97@gmail.com>
Authored: Wed Sep 25 18:20:32 2013 -0700
Committer: Steven Gill <stevengill97@gmail.com>
Committed: Wed Sep 25 18:20:32 2013 -0700

----------------------------------------------------------------------
 CHANGELOG.md                    | 25 -------------------------
 RELEASENOTES.md                 | 35 +++++++++++++++++++++++++++++++++++
 plugin.xml                      |  8 +++++---
 src/firefoxos/VibrationProxy.js | 35 +++++++++++++++++++++++++++++++++++
 src/firefoxos/vibration.js      | 34 ----------------------------------
 5 files changed, 75 insertions(+), 62 deletions(-)
----------------------------------------------------------------------



Mime
View raw message