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 2012/07/27 02:29:15 UTC

[1/78] [abbrv] git commit: conflict :(

Updated Branches:
  refs/heads/cordova-client 68340ce43 -> a963a21a3


conflict :(


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

Branch: refs/heads/cordova-client
Commit: a963a21a3c497acef1b71c5ecbebf8a8d7d4a377
Parents: b50a88a 68340ce
Author: Anis Kadri <an...@gmail.com>
Authored: Thu Jul 26 17:28:43 2012 -0700
Committer: Anis Kadri <an...@gmail.com>
Committed: Thu Jul 26 17:28:43 2012 -0700

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

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