Changeset [7ab20145d1a32af45cf49ed40fde2eb18d90076a] by Adam Radabaugh
May 15th, 2012 @ 10:15 AM
Merge branch 'master' of git://github.com/cappuccino/cappuccino
Conflicts:
Tests/Manual/CPButtonTest/Resources/MainMenu.cib
https://github.com/cappuccino/cappuccino/commit/7ab20145d1a32af45cf...
Committed by Adam Radabaugh
- A Tests/Manual/CPProgressIndicator/AppController.j
- A Tests/Manual/CPProgressIndicator/Info.plist
- A Tests/Manual/CPProgressIndicator/Jakefile
- A Tests/Manual/CPProgressIndicator/Resources/MainMenu.cib
- A Tests/Manual/CPProgressIndicator/Resources/MainMenu.xib
- A Tests/Manual/CPProgressIndicator/Resources/spinner.gif
- A Tests/Manual/CPProgressIndicator/index-debug.html
- A Tests/Manual/CPProgressIndicator/index.html
- A Tests/Manual/CPProgressIndicator/main.j
- M AppKit/CPGeometry.j
- M AppKit/CPPopover.j
- M AppKit/CPProgressIndicator.j
- M AppKit/CPShadow.j
- M AppKit/CPStepper.j
- M AppKit/CPWindow/_CPWindowView.j
- M AppKit/CoreGraphics/CGContextCanvas.j
- M Foundation/CPArray/CPArray.j
- M Foundation/CPCharacterSet.j
- M Foundation/CPData.j
- M Foundation/CPDecimal.j
- M Foundation/CPDictionary.j
- M Foundation/CPObject.j
- M Objective-J/CFData.js
- M Objective-J/Constants.js
- M Tests/AppKit/CGAffineTransformTest.j
- M Tests/AppKit/CPColorTest.j
- M Tests/AppKit/CPTableViewTest.j
- M Tests/AppKit/Resources/SimpleBindingsAdoption_03.cib
- M Tests/AppKit/WithAndWithoutBindingsIntegration/01_WithoutBindings/Resources/01_WithoutBindings.cib
- M Tests/AppKit/WithAndWithoutBindingsIntegration/02_WithBindings/Resources/02_WithBindings.cib
- M Tests/Foundation/CPArrayTest.j
- M Tests/Foundation/CPDateTest.j
- M Tests/Foundation/CPDecimalNumberTest.j
- M Tests/Foundation/CPDecimalTest.j
- M Tests/Foundation/CPDictionaryTest.j
- M Tests/Foundation/CPMutableArrayTest.j
- M Tests/Manual/ArrayController1/Resources/MainMenu.cib
- M Tests/Manual/CPBoxTest/Resources/MainMenu.cib
- M Tests/Manual/CPButtonKeyEquivalentDefaultTest/Resources/MainMenu.cib
- M Tests/Manual/CPButtonTest/Resources/MainMenu.cib
- M Tests/Manual/CPColor-CPImage-description/Resources/MainMenu.cib
- M Tests/Manual/CPColorWellBindings/Resources/MainMenu.cib
- M Tests/Manual/CPFormatterTest/AppController.j
- M Tests/Manual/CPFormatterTest/Resources/MainMenu.cib
- M Tests/Manual/CPImageViewbindingsTest/Resources/MainMenu.cib
- M Tests/Manual/CPLevelIndicator/Resources/MainMenu.cib
- M Tests/Manual/CPLogTest/Resources/MainMenu.cib
- M Tests/Manual/CPOutlineViewCibTest/Resources/MainMenu.cib
- M Tests/Manual/CPPopover/AppController.j
- M Tests/Manual/CPPredicateEditorCibTest/Resources/MainMenu.cib
- M Tests/Manual/CPRuleEditorCibTest/Resources/MainMenu.cib
- M Tests/Manual/CPScrollView2/Resources/MainMenu.cib
- M Tests/Manual/CPSearchField/Resources/MainMenu.cib
- M Tests/Manual/CPSplitViewTest/Resources/MainMenu.cib
- M Tests/Manual/CPTextFieldHeightTest/Resources/MainMenu.cib
- M Tests/Manual/CPUserDefaultsControllerTest/Resources/MainMenu.cib
- M Tests/Manual/CPWebViewTest/Resources/MainMenu.cib
- M Tests/Manual/ContinuouslyUpdatesValueBinding/Resources/MainMenu.cib
- M Tests/Manual/FontEnhancementTest/Resources/MainMenu.cib
- M Tests/Manual/FontMetricsExplorer/Resources/MainMenu.cib
- M Tests/Manual/LoadTimeTest/AppController.j
- M Tests/Manual/LongBindings/Resources/MainMenu.cib
- M Tests/Manual/NSBoxTest/AppController.j
- M Tests/Manual/NSBoxTest/Resources/MainMenu.cib
- M Tests/Manual/Nib2CibAligment/Resources/MainMenu.cib
- M Tests/Manual/NibAppRemixed/Resources/MainMenu.cib
- M Tests/Manual/PlatformWindows/AppController.j
- M Tests/Manual/PlatformWindows/Resources/MainMenu.cib
- M Tests/Manual/ScrollviewTheming/Resources/MainMenu.cib
- M Tests/Manual/SmartFoldersDemo/Resources/MainMenu.cib
- M Tests/Manual/SmartFoldersDemo/Resources/PredicateEditor.cib
- M Tests/Manual/TableTest/BorderTableTest/Resources/MainMenu.cib
- M Tests/Manual/TableTest/HeaderCornerView/Resources/MainMenu.cib
- M Tests/Manual/TableTest/TableBindings/Resources/MainMenu.cib
- M Tests/Manual/TableTest/TableCibTest/Resources/MainMenu.cib
- M Tests/Manual/ThemeBrowser/Resources/MainMenu.cib
- M Tests/Manual/performKeyEquivalentTest/Resources/MainMenu.cib
- M Tests/Manual/predicateWithFormat/Resources/MainMenu.cib
- M Tests/Objective-J/Preprocessor/BehaviorTests/MethodTest.j
- M Tools/nib2cib/Converter.j
- M Tools/nib2cib/NSProgressIndicator.j
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
The Cappuccino Web Framework, including AppKit, Foundation, and Objective-J.