You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/04/24 23:11:27 UTC
[42/45] js commit: Merge branch 'browserify' of
https://git-wip-us.apache.org/repos/asf/cordova-js into browserify
Merge branch 'browserify' of https://git-wip-us.apache.org/repos/asf/cordova-js into browserify
Conflicts:
package.json
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/40c4ab4a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/40c4ab4a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/40c4ab4a
Branch: refs/heads/master
Commit: 40c4ab4ad434df733fa048bc2caf29e2cb3a0084
Parents: 82d62c8 f4f5bb6
Author: Anis Kadri <an...@apache.org>
Authored: Thu Mar 27 15:21:54 2014 +0100
Committer: Anis Kadri <an...@apache.org>
Committed: Thu Mar 27 15:21:54 2014 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------