Permalink
Switch branches/tags
Nothing to show
Commits on May 3, 2012
Commits on Nov 16, 2011
  1. ignore mac diff leftovers

    zbowling committed Nov 16, 2011
Commits on Sep 12, 2011
  1. Merge https://github.com/joshaber/Chameleon

    zbowling committed Sep 12, 2011
    Conflicts:
    	UIKit/Classes/UIColor.m
  2. Merge remote-tracking branch 'remotes/rf/uitabbar'

    zbowling committed Sep 12, 2011
    Conflicts:
    	UIKit/Classes/UIBarItem.m
    	UIKit/Classes/UIImage+UIPrivate.h
    	UIKit/Classes/UITabBar.h
    	UIKit/Classes/UITabBar.m
    	UIKit/Classes/UITabBarController.h
    	UIKit/Classes/UITabBarController.m
    	UIKit/Classes/UITabBarItem.m
    	UIKit/Classes/UIViewController+UIPrivate.h
    	UIKit/Classes/UIViewController.h
    	UIKit/Classes/UIViewController.m
    	UIKit/UIKit.xcodeproj/project.pbxproj
    
    Signed-off-by: Zac Bowling <zac@zacbowling.com>
  3. Merge branch 'gccsupport'

    zbowling committed Sep 12, 2011
  4. Merge branch 'gccsupport'

    zbowling committed Sep 12, 2011
  5. Add SeatMe copyright.

    zbowling committed Sep 12, 2011
  6. oops. revert some stuff

    zbowling committed Sep 12, 2011
  7. 64bit safer and new slider stubs.

    zbowling committed Sep 12, 2011
    Signed-off-by: Zac Bowling <zac@zacbowling.com>
  8. Some safety checks. Also no longer attempts to dismiss a popover whil…

    BigZaphod authored and zbowling committed Sep 8, 2011
    …e it's already dismissing.
    
    Conflicts:
    
    	UIKit/Classes/UIPopoverController.h
    	UIKit/Classes/UIPopoverController.m
    
    Signed-off-by: Zac Bowling <zac@zacbowling.com>
  9. GCC support is restored

    zbowling committed Sep 12, 2011
  10. Revert "Moved member variables from headers to implementation files."

    zbowling committed Sep 12, 2011
    This reverts commit 963049d.
    
    Conflicts:
    
    	UIKit/Classes/UIPageControl.m
    	UIKit/Classes/UIPanGestureRecognizer.h
    	UIKit/Classes/UIPanGestureRecognizer.m
    	UIKit/Classes/UIPickerView.h
    	UIKit/Classes/UIPickerView.m
    	UIKit/Classes/UIPinchGestureRecognizer.m
    	UIKit/Classes/UIPopoverController.m
    	UIKit/Classes/UIProgressView.m
    	UIKit/Classes/UIRotationGestureRecognizer.m
    	UIKit/Classes/UIScreen.m
    	UIKit/Classes/UIScreenAppKitIntegration.m
    	UIKit/Classes/UIScreenMode.m
    	UIKit/Classes/UIScrollView.h
    	UIKit/Classes/UIScrollView.m
    	UIKit/Classes/UISearchBar.m
    	UIKit/Classes/UISearchDisplayController.m
    	UIKit/Classes/UITableView.m
Commits on Sep 11, 2011
Commits on Sep 8, 2011
  1. Edited README.md via GitHub

    zbowling committed Sep 8, 2011
  2. Edited README.md via GitHub

    zbowling committed Sep 8, 2011
Commits on Sep 7, 2011
Commits on Sep 6, 2011
  1. fixing a few things up

    zbowling committed Sep 6, 2011
Commits on Sep 5, 2011
  1. Edited README.md via GitHub

    zbowling committed Sep 5, 2011
  2. Edited README.md via GitHub

    zbowling committed Sep 5, 2011
  3. Merge branch 'local'

    zbowling committed Sep 5, 2011
    Conflicts:
    	UIKit/Classes/UIPopoverController.h
    	UIKit/Classes/UISwitch.h
    	UIKit/UIKit.xcodeproj/project.pbxproj
  4. Merge branch 'master' of https://github.com/dmgctrl/Chameleon into test

    zbowling committed Sep 5, 2011
    Conflicts:
    	AddressBookUI/Classes/AddressBookUI_Prefix.pch
    	UIKit/Classes/NSFetchedResultsController.h
    	UIKit/Classes/UIAccelerometer.h
    	UIKit/Classes/UIActionSheet.h
    	UIKit/Classes/UIAlertView.h
    	UIKit/Classes/UIApplication.h
    	UIKit/Classes/UIApplication.m
    	UIKit/Classes/UIBackgroundTask.h
    	UIKit/Classes/UIBackgroundTask.m
    	UIKit/Classes/UIBarButtonItem.h
    	UIKit/Classes/UIBarButtonItem.m
    	UIKit/Classes/UIBarItem.h
    	UIKit/Classes/UIBarItem.m
    	UIKit/Classes/UIColor.m
    	UIKit/Classes/UIDevice.m
    	UIKit/Classes/UIGestureRecognizer.h
    	UIKit/Classes/UIGraphics.m
    	UIKit/Classes/UIImage.m
    	UIKit/Classes/UINavigationBar.h
    	UIKit/Classes/UINavigationBar.m
    	UIKit/Classes/UINavigationController.h
    	UIKit/Classes/UINavigationController.m
    	UIKit/Classes/UINavigationItem.m
    	UIKit/Classes/UINinePartImage.h
    	UIKit/Classes/UINinePartImage.m
    	UIKit/Classes/UIPickerView.h
    	UIKit/Classes/UIPopoverController.h
    	UIKit/Classes/UIPopoverController.m
    	UIKit/Classes/UIPopoverView.m
    	UIKit/Classes/UIScrollView.h
    	UIKit/Classes/UIScrollView.m
    	UIKit/Classes/UIScrollViewScrollAnimation.h
    	UIKit/Classes/UIScrollViewScrollAnimation.m
    	UIKit/Classes/UIScroller.h
    	UIKit/Classes/UIScroller.m
    	UIKit/Classes/UISearchBar.h
    	UIKit/Classes/UISearchDisplayController.h
    	UIKit/Classes/UISearchField.h
    	UIKit/Classes/UISegmentedControl.m
    	UIKit/Classes/UISplitViewController.h
    	UIKit/Classes/UIStringDrawing.m
    	UIKit/Classes/UITabBar.h
    	UIKit/Classes/UITabBarController.h
    	UIKit/Classes/UITableView.h
    	UIKit/Classes/UITableViewCell.m
    	UIKit/Classes/UITableViewSectionLabel.m
    	UIKit/Classes/UITextField.h
    	UIKit/Classes/UIThreePartImage.h
    	UIKit/Classes/UIThreePartImage.m
    	UIKit/Classes/UIToolbar.m
    	UIKit/Classes/UITransitionView.m
    	UIKit/Classes/UIView.m
    	UIKit/Classes/UIViewController.h
    	UIKit/Classes/UIViewController.m
    	UIKit/Classes/UIWebView.h
    	UIKit/Classes/UIWindow.m
    	UIKit/UIKit.xcodeproj/project.pbxproj
Commits on Sep 4, 2011
  1. minor changes

    zbowling committed Sep 4, 2011
  2. fix bugs

    zbowling committed Sep 4, 2011
  3. updated to support the new beta [redacted]

    zbowling committed Sep 4, 2011
    changing view controller containment and update UIImage a little.
    not everything done. some missing pieces.
Commits on Aug 25, 2011