Changeset [ed2c65dd6ff9e89f70fd3150683bd4ad4b96ac98] by Alexander Ljungberg
May 26th, 2010 @ 01:05 PM
Merge branch 'master' of git://github.com/280north/cappuccino into bindings-merge
Conflicts:
AppKit/CPTableView.j
Foundation/CPArray+KVO.j
Foundation/CPArray.j
http://github.com/280north/cappuccino/commit/ed2c65dd6ff9e89f70fd31...
Committed by Alexander Ljungberg
- A AppKit/Resources/action_button.png
- A AppKit/Themes/Aristo/Resources/HUD/button-bezel-disabled-center.png
- A AppKit/Themes/Aristo/Resources/HUD/button-bezel-disabled-left.png
- A AppKit/Themes/Aristo/Resources/HUD/button-bezel-disabled-right.png
- A AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-center.png
- A AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-disabled-center.png
- A AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-disabled-left.png
- A AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-disabled-right.png
- A AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-highlighted-center.png
- A AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-highlighted-left.png
- A AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-highlighted-right.png
- A AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-left.png
- A AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-right.png
- A AppKit/Themes/Aristo/Resources/HUD/horizontal-track-center.png
- A AppKit/Themes/Aristo/Resources/HUD/horizontal-track-disabled-center.png
- A AppKit/Themes/Aristo/Resources/HUD/horizontal-track-disabled-left.png
- A AppKit/Themes/Aristo/Resources/HUD/horizontal-track-disabled-right.png
- A AppKit/Themes/Aristo/Resources/HUD/horizontal-track-left.png
- A AppKit/Themes/Aristo/Resources/HUD/horizontal-track-right.png
- A AppKit/Themes/Aristo/Resources/HUD/knob-highlighted.png
- A AppKit/Themes/Aristo/Resources/HUD/knob.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-center.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-center.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-divider.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-left.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-disabled-right.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-divider.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-center.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-center.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-divider.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-left.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-right copy.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-disabled-right.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-divider.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-left.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-highlighted-right.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-left.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-center.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-center.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-left.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-highlighted-right.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-left.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-pushed-right.png
- A AppKit/Themes/Aristo/Resources/HUD/segmented-control-bezel-right.png
- A AppKit/Themes/Aristo/Resources/HUD/slider-circular-bezel.png
- A AppKit/Themes/Aristo/Resources/HUD/slider-circular-disabled-bezel.png
- A AppKit/Themes/Aristo/Resources/HUD/slider-circular-disabled-knob.png
- A AppKit/Themes/Aristo/Resources/HUD/slider-circular-knob.png
- A AppKit/Themes/Aristo/Resources/HUD/vertical-track-bottom.png
- A AppKit/Themes/Aristo/Resources/HUD/vertical-track-center.png
- A AppKit/Themes/Aristo/Resources/HUD/vertical-track-disabled-bottom.png
- A AppKit/Themes/Aristo/Resources/HUD/vertical-track-disabled-center.png
- A AppKit/Themes/Aristo/Resources/HUD/vertical-track-disabled-top.png
- A AppKit/Themes/Aristo/Resources/HUD/vertical-track-top.png
- A CommonJS/lib/cappuccino/nativehost.js
- A Tests/AppKit/CPPopUpButtonTest.j
- A Tests/Foundation/CPArrayPerformance.j
- A Tests/Foundation/CPNullTest.j
- A Tests/Foundation/CPObjectTest.j
- A Tests/Objective-J/CFDictionaryTest.j
- A Tests/Tools/ToolsTest.j
- A Tools/NativeHost/.gitignore
- A Tools/NativeHost/AppController+MainMenu.m
- A Tools/NativeHost/AppController+WebFrameLoadDelegate.m
- A Tools/NativeHost/AppController+WebPolicyDelegate.m
- A Tools/NativeHost/AppController+WebResourceLoadDelegate.m
- A Tools/NativeHost/AppController+WebUIDelegate.m
- A Tools/NativeHost/AppController.h
- A Tools/NativeHost/AppController.m
- A Tools/NativeHost/Application.h
- A Tools/NativeHost/Application.m
- A Tools/NativeHost/BridgedMethods.h
- A Tools/NativeHost/BridgedMethods.m
- A Tools/NativeHost/Console.h
- A Tools/NativeHost/Console.m
- A Tools/NativeHost/English.lproj/InfoPlist.strings
- A Tools/NativeHost/English.lproj/MainMenu.xib
- A Tools/NativeHost/Info.plist
- A Tools/NativeHost/Jakefile
- A Tools/NativeHost/MenuBridge.h
- A Tools/NativeHost/MenuBridge.m
- A Tools/NativeHost/MenuItemBridge.h
- A Tools/NativeHost/MenuItemBridge.m
- A Tools/NativeHost/NSObject+WebAdditions.h
- A Tools/NativeHost/NSObject+WebAdditions.m
- A Tools/NativeHost/NSURL+Additions.h
- A Tools/NativeHost/NSURL+Additions.m
- A Tools/NativeHost/NativeHost.xcodeproj/TemplateIcon.icns
- A Tools/NativeHost/NativeHost.xcodeproj/project.pbxproj
- A Tools/NativeHost/NativeHost_Prefix.pch
- A Tools/NativeHost/SSCrypto.h
- A Tools/NativeHost/SSCrypto.m
- A Tools/NativeHost/Server.h
- A Tools/NativeHost/Server.m
- A Tools/NativeHost/WebPasteboardProxy.h
- A Tools/NativeHost/WebPasteboardProxy.m
- A Tools/NativeHost/WebScripObject+Objective-J.h
- A Tools/NativeHost/WebScripObject+Objective-J.m
- A Tools/NativeHost/WebWindow.h
- A Tools/NativeHost/WebWindow.m
- A Tools/NativeHost/icon.icns
- A Tools/NativeHost/main.m
- A Tools/nib2cib/NSSortDescriptor.j
- M AppKit/CPAccordionView.j
- M AppKit/CPApplication.j
- M AppKit/CPBrowser.j
- M AppKit/CPButton.j
- M AppKit/CPButtonBar.j
- M AppKit/CPCheckBox.j
- M AppKit/CPClipView.j
- M AppKit/CPCollectionView.j
- M AppKit/CPColorWell.j
- M AppKit/CPCursor.j
- M AppKit/CPDragServer.j
- M AppKit/CPImageView.j
- M AppKit/CPMenu/CPMenu.j
- M AppKit/CPOutlineView.j
- M AppKit/CPPopUpButton.j
- M AppKit/CPScrollView.j
- M AppKit/CPSearchField.j
- M AppKit/CPSlider.j
- M AppKit/CPSplitView.j
- M AppKit/CPTableColumn.j
- M AppKit/CPTableHeaderView.j
- M AppKit/CPTableView.j
- M AppKit/CPTextField.j
- M AppKit/CPTheme.j
- M AppKit/CPToolbar.j
- M AppKit/CPToolbarItem.j
- M AppKit/CPView.j
- M AppKit/CPViewAnimation.j
- M AppKit/CPWebView.j
- M AppKit/CPWindow/CPWindow.j
- M AppKit/Cib/CPCibLoading.j
- M AppKit/Platform/CPPlatformWindow.j
- M AppKit/Platform/DOM/CPPlatformWindow+DOM.j
- M AppKit/Themes/Aristo/Resources/HUD/button-bezel-center.png
- M AppKit/Themes/Aristo/Resources/HUD/button-bezel-highlighted-center.png
- M AppKit/Themes/Aristo/Resources/HUD/button-bezel-highlighted-left.png
- M AppKit/Themes/Aristo/Resources/HUD/button-bezel-highlighted-right.png
- M AppKit/Themes/Aristo/Resources/HUD/button-bezel-left.png
- M AppKit/Themes/Aristo/Resources/HUD/button-bezel-right.png
- M AppKit/Themes/Aristo/ThemeDescriptors.j
- M AppKit/_CPCornerView.j
- M AppKit/_CPImageAndTextView.j
- M CommonJS/lib/cappuccino/objj-flatten-additions.js
- M Foundation/CPArray+KVO.j
- M Foundation/CPArray.j
- M Foundation/CPAttributedString.j
- M Foundation/CPBundle.j
- M Foundation/CPCoder.j
- M Foundation/CPCountedSet.j
- M Foundation/CPData.j
- M Foundation/CPDate.j
- M Foundation/CPDictionary.j
- M Foundation/CPEnumerator.j
- M Foundation/CPException.j
- M Foundation/CPFunctionOperation.j
- M Foundation/CPIndexSet.j
- M Foundation/CPInvocation.j
- M Foundation/CPInvocationOperation.j
- M Foundation/CPJSONPConnection.j
- M Foundation/CPKeyValueCoding.j
- M Foundation/CPKeyValueObserving.j
- M Foundation/CPKeyedArchiver.j
- M Foundation/CPKeyedUnarchiver.j
- M Foundation/CPNotification.j
- M Foundation/CPNotificationCenter.j
- M Foundation/CPNull.j
- M Foundation/CPNumber.j
- M Foundation/CPObjJRuntime.j
- M Foundation/CPObject.j
- M Foundation/CPOperation.j
- M Foundation/CPOperationQueue.j
- M Foundation/CPProxy.j
- M Foundation/CPRange.j
- M Foundation/CPRunLoop.j
- M Foundation/CPSet.j
- M Foundation/CPSortDescriptor.j
- M Foundation/CPString.j
- M Foundation/CPTimer.j
- M Foundation/CPURL.j
- M Foundation/CPURLConnection.j
- M Foundation/CPURLRequest.j
- M Foundation/CPURLResponse.j
- M Foundation/CPUndoManager.j
- M Foundation/CPUserSessionManager.j
- M Foundation/CPValue.j
- M Foundation/CPWebDAVManager.j
- M Foundation/Foundation.j
- M Objective-J/CFBundle.js
- M Objective-J/CFDictionary.js
- M Objective-J/CFHTTPRequest.js
- M Objective-J/CFPropertyList.js
- M Objective-J/CommonJS/lib/objective-j.js
- M Objective-J/CommonJS/lib/objective-j/jake/bundletask.js
- M Objective-J/Preprocessor.js
- M Objective-J/Runtime.js
- M Tests/Foundation/CPArrayTest.j
- M Tests/Foundation/CPKVOTest.j
- M Tests/Foundation/CPSetTest.j
- M Tests/Manual/CPBrowserTest/AppController.j
- M Tests/Manual/LoadTimeTest/AppController.j
- M Tests/Manual/TableCibTest/Resources/MainMenu.cib
- M Tests/Manual/TableCibTest/Resources/MainMenu.xib
- M Tests/Manual/TableTest/AppController.j
- M Tools/Jakefile
- M Tools/capp/Resources/Templates/Application/Jakefile
- M Tools/capp/Resources/Templates/NibApplication/Jakefile
- M Tools/capp/Resources/Templates/ThemeDescriptor/Jakefile
- M Tools/nib2cib/NSAppKit.j
- M Tools/nib2cib/NSFont.j
- M Tools/nib2cib/NSSearchField.j
- M Tools/nib2cib/NSTableColumn.j
- M Tools/nib2cib/NSTableView.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.