cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From macdo...@apache.org
Subject [1/2] android commit: Fixing merge conflict
Date Tue, 02 Oct 2012 13:54:52 GMT
Updated Branches:
  refs/heads/master 3404a6c69 -> 467cbe972


Fixing merge conflict


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/467cbe97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/467cbe97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/467cbe97

Branch: refs/heads/master
Commit: 467cbe972c7c736e7224497dde64e6c44ab68bc8
Parents: bfd1bfe 3404a6c
Author: Simon MacDonald <simon.macdonald@gmail.com>
Authored: Tue Oct 2 09:54:36 2012 -0400
Committer: Simon MacDonald <simon.macdonald@gmail.com>
Committed: Tue Oct 2 09:54:36 2012 -0400

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

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



Mime
View raw message