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 2012/06/20 18:49:30 UTC

[1/2] android commit: Fixing merge error

Updated Branches:
  refs/heads/master c1c907596 -> 507554b8e


Fixing merge error


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/507554b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/507554b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/507554b8

Branch: refs/heads/master
Commit: 507554b8e8543a50c37cda3f19f1e14b96859ced
Parents: 4795133 c1c9075
Author: macdonst <si...@gmail.com>
Authored: Wed Jun 20 12:47:00 2012 -0400
Committer: macdonst <si...@gmail.com>
Committed: Wed Jun 20 12:47:00 2012 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------