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/26 02:11:51 UTC

[2/2] js commit: Merge branch 'browserify'

Merge branch 'browserify'

Conflicts:
	src/cordova_b.js


Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/9c165de7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/9c165de7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/9c165de7

Branch: refs/heads/master
Commit: 9c165de7ca85addd61434888213107558c31221a
Parents: 68ab22d 5ba8e90
Author: Anis Kadri <an...@apache.org>
Authored: Fri Apr 25 14:21:11 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Fri Apr 25 14:21:11 2014 -0700

----------------------------------------------------------------------
 src/cordova_b.js | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 239 insertions(+)
----------------------------------------------------------------------