You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2013/03/25 18:21:14 UTC

[3/4] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli


Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/089bbffc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/089bbffc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/089bbffc

Branch: refs/heads/master
Commit: 089bbffc52a9267baee8ec6a136651ac5d6010b0
Parents: b5d9f22 847040a
Author: Braden Shepherdson <br...@gmail.com>
Authored: Mon Mar 18 11:27:16 2013 -0400
Committer: Braden Shepherdson <br...@gmail.com>
Committed: Mon Mar 18 11:27:16 2013 -0400

----------------------------------------------------------------------
 lib/cordova-android/framework/local.properties |   10 ----------
 package.json                                   |    2 +-
 spec/metadata/blackberry_parser.spec.js        |    4 ++++
 src/emulate.js                                 |    4 ++--
 4 files changed, 7 insertions(+), 13 deletions(-)
----------------------------------------------------------------------