resolving merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/1d146cc4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/1d146cc4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/1d146cc4 Branch: refs/heads/master Commit: 1d146cc4e8738de9ee6ee9f8c3248bbcef7872a8 Parents: 09883f8 ab39032 Author: Michal Mocny <mmo...@gmail.com> Authored: Wed Aug 22 10:53:16 2012 -0400 Committer: Michal Mocny <mmo...@gmail.com> Committed: Wed Aug 22 10:53:16 2012 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
