Skip to content

Commit d49e605

Browse files
author
Jon Kean
committedJul 11, 2010
Merge branch 'master' of http://github.com/omz/AppSales-Mobile
Conflicts: AppSalesMobile.xcodeproj/project.pbxproj Classes/App.h Classes/App.m Classes/AppCell.m Classes/AppSalesMobileAppDelegate.h Classes/AppSalesMobileAppDelegate.m Classes/CountriesController.m Classes/Country.h Classes/Country.m Classes/Day.h Classes/Day.m Classes/DayCell.m Classes/DaysController.m Classes/Entry.m Classes/ReportManager.h Classes/ReportManager.m Classes/Review.h Classes/Review.m Classes/ReviewsController.m Classes/ReviewsListController.h Classes/ReviewsListController.m Classes/RootViewController.m Classes/SettingsViewController.m Classes/TrendGraphView.m Classes/WeekCell.m Classes/WeeksController.m English.lproj/SettingsViewController.xib German.lproj/Localizable.strings Images/Default.png Info.plist README.textile ReviewTemplate.html
2 parents 7de837b + 3a4da5b commit d49e605

File tree

208 files changed

+19084
-7113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+19084
-7113
lines changed
 

‎AppSalesMobile.xcodeproj/project.pbxproj

+639-199
Large diffs are not rendered by default.

‎AppSalesMobile.xcodeproj/project.pbxproj.orig

+1,728
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.