You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cordova.apache.org by ma...@apache.org on 2014/09/05 21:42:54 UTC

[5/5] spec commit: Merge branch 'master' into 3.6.x

Merge branch 'master' into 3.6.x

Conflicts:
	VERSION


Project: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/commit/09baccdd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/09baccdd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/09baccdd

Branch: refs/heads/3.6.x
Commit: 09baccdd575b55927645951a2f7a42eae13174d8
Parents: 1590310 f2a8088
Author: Marcel Kinard <cm...@gmail.com>
Authored: Fri Sep 5 15:41:31 2014 -0400
Committer: Marcel Kinard <cm...@gmail.com>
Committed: Fri Sep 5 15:41:31 2014 -0400

----------------------------------------------------------------------
 createmobilespec/createmobilespec.js | 75 ++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 26 deletions(-)
----------------------------------------------------------------------