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 2014/08/05 19:51:15 UTC
[5/5] git commit: Merge branch 'browserify' of
github.com:surajpindoria/cordova-lib
Merge branch 'browserify' of github.com:surajpindoria/cordova-lib
Conflicts:
cordova-lib/src/cordova/prepare.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/c4ab88d4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/c4ab88d4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/c4ab88d4
Branch: refs/heads/master
Commit: c4ab88d4e2ef92e36e37f710d1516fb7b1bdf19c
Parents: 8dc8fef 5b4fdf9
Author: Steven Gill <st...@gmail.com>
Authored: Tue Aug 5 10:51:01 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue Aug 5 10:51:01 2014 -0700
----------------------------------------------------------------------
cordova-lib/src/cordova/prepare.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------