You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2015/12/05 02:30:43 UTC
[1/2] cordova-lib git commit: Merge branch 'CB-9590' of
https://github.com/cordova-ubuntu/cordova-lib
Repository: cordova-lib
Updated Branches:
refs/heads/master d530d7a35 -> b01e3bc69
Merge branch 'CB-9590' of https://github.com/cordova-ubuntu/cordova-lib
This closes #349. This closes #347
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/dfca0e50
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/dfca0e50
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/dfca0e50
Branch: refs/heads/master
Commit: dfca0e501f911d498c4d6a6ece22fafe91e7bf15
Parents: 46305f1 e32ca64
Author: Steve Gill <st...@gmail.com>
Authored: Fri Dec 4 17:23:49 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Dec 4 17:27:42 2015 -0800
----------------------------------------------------------------------
cordova-lib/src/plugman/platforms/ubuntu.js | 36 +++++++++++++++---------
1 file changed, 23 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-lib git commit: fixing merge conflict
Posted by st...@apache.org.
fixing merge conflict
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/b01e3bc6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/b01e3bc6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/b01e3bc6
Branch: refs/heads/master
Commit: b01e3bc692d8b22f103bd872fce0d71e54a26f85
Parents: dfca0e5 d530d7a
Author: Steve Gill <st...@gmail.com>
Authored: Fri Dec 4 17:30:30 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Dec 4 17:30:30 2015 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org