{"shas":[["996bd9cb7676e439780347ac4ebf8a696b369c7c","d7e19930cc1f42c2d0781f4d9e6f1fe5891bf9cf@iconfactory.com","Some cleanup of the previous merge. Removed references to SSDrawingMacros.","Sean Heber"],["a4f97be79146312c1eacb357a08e7a3302115b34","d7e19930cc1f42c2d0781f4d9e6f1fe5891bf9cf@iconfactory.com","Code style fixes to match the rest of the project and a few potential bug fixes.","Sean Heber"],["7f355947168f7de205d29f5dc66c391ce5ef5cc4","d7e19930cc1f42c2d0781f4d9e6f1fe5891bf9cf@iconfactory.com","This makes sure that the new view controller's view gets loaded before viewWillAppear: is called.","Sean Heber"],["d4461d60cd337aa2d9b37e97eb3ad5e0712d1249","b47fab43863efbbc97703e657250e83a2e032ab5@gmail.com","Merge branch 'master' of https://github.com/BigZaphod/Chameleon\n\nConflicts:\n\tUIKit/Classes/UIActionSheet.h\n\tUIKit/Classes/UIActionSheet.m\n\tUIKit/Classes/UIColor.m\n\tUIKit/Classes/UIKit.h\n\tUIKit/Classes/UINavigationBar.m\n\tUIKit/Classes/UIPickerView.h\n\tUIKit/Classes/UIPickerView.m\n\tUIKit/Classes/UITabBarController.h\n\tUIKit/Classes/UITableViewCell.h\n\tUIKit/Classes/UITableViewCell.m\n\tUIKit/Classes/UIViewController.m\n\tUIKit/UIKit.xcodeproj/project.pbxproj\n\nSigned-off-by: Casey Marshall <casey.s.marshall@gmail.com>","Casey Marshall"],["5666c21e470ba633f0fe6e50ec7d694aa301643b","b47fab43863efbbc97703e657250e83a2e032ab5@gmail.com","Added.\n\nSigned-off-by: Casey Marshall <casey.s.marshall@gmail.com>","Casey Marshall"],["49be3022ad4fb123c97a9bf52f8ece22b3ae747a","b47fab43863efbbc97703e657250e83a2e032ab5@gmail.com","Fix merge.\n\nSigned-off-by: Casey Marshall <casey.s.marshall@gmail.com>","Casey Marshall"],["97f636f9a704b155af9d0b867ed801f9e09759c2","b47fab43863efbbc97703e657250e83a2e032ab5@gmail.com","UIKit stubs.\n\n* UIKit/Classes/UIKit.h: add UIDatePicker.h.\n* UIKit/Classes/UIPickerView.h: add stubs.\n* UIKit/Classes/UIPickerView.m: add stubs.\n* UIKit/UIKit.xcodeproj/project.pbxproj: add UIDatePicker.*, make CALayer+UIKitCompatibility.h a public header.\n\nSigned-off-by: Casey Marshall <casey.s.marshall@gmail.com>","Casey Marshall"],["1199d71621a09b7824721dcf30c343016870387d","b47fab43863efbbc97703e657250e83a2e032ab5@gmail.com","Commit this; see previous commit.\n\nSigned-off-by: Casey Marshall <casey.s.marshall@gmail.com>","Casey Marshall"],["f0b9e878cb0bd12ad35367a9596ca87fa1b3caa1","b47fab43863efbbc97703e657250e83a2e032ab5@gmail.com","Fix merge.\n\nSigned-off-by: Casey Marshall <casey.s.marshall@gmail.com>","Casey Marshall"]],"repo":"csm/Chameleon","actor":"csm","ref":"refs/heads/master","size":9,"head":"f0b9e878cb0bd12ad35367a9596ca87fa1b3caa1","actor_gravatar":"6309a66d6703838e3a140c5c3ce9549a","push_id":27459058}