Changeset [54e106bb14b44946709eaa89f0f6769c5791850d] by Randall Luecke
Revision 54e106bb14b44946709eaa89f0f6769c5791850d,
committed by Randall Luecke
· December 2nd, 2010 @ 02:51 PM
Merge branch 'master' of git://github.com/280north/cappuccino
Conflicts:
AppKit/CPTableView.j
https://github.com/280north/cappuccino/commit/54e106bb14b44946709ea...
93 changed files
-
A
Tests/Manual/CPSearchField/Jakefile -
A
Tests/Manual/CPSearchField/Resources/MainMenu.cib -
A
Tests/Manual/CPSearchField/Resources/MainMenu.xib -
A
Tests/Manual/CPSearchField/Resources/spinner.gif -
M
AppKit/CPAnimation.j -
M
AppKit/CPColorPanel.j -
M
AppKit/CPDragServer.j -
M
AppKit/CPEvent.j -
M
AppKit/CPFlashView.j -
M
AppKit/CPFontManager.j -
M
AppKit/CPGeometry.j -
M
AppKit/CPGraphicsContext.j -
M
AppKit/CPImage.j -
M
AppKit/CPImageView.j -
M
AppKit/CPOutlineView.j -
M
AppKit/CPPanel.j -
M
AppKit/CPPasteboard.j -
M
AppKit/CPProgressIndicator.j -
M
AppKit/CPSearchField.j -
M
AppKit/CPShadow.j -
M
AppKit/CPSliderColorPicker.j -
M
AppKit/CPStepper.j -
M
AppKit/CPTabViewItem.j -
M
AppKit/CPTableHeaderView.j -
M
AppKit/CPTableView.j -
M
AppKit/CPToolbar.j -
M
AppKit/CPToolbarItem.j -
M
AppKit/CPViewAnimation.j -
M
AppKit/CPWebView.j -
M
AppKit/CPWindowController.j -
M
AppKit/Cib/_CPCibCustomObject.j -
M
Foundation/CPDecimal.j -
M
Tests/Foundation/CPAttributedStringTest.j -
M
Tests/Foundation/CPCountedSetTest.j -
M
Tests/Foundation/CPFunctionOperationTest.j -
M
Tests/Foundation/CPIndexSetTest.j -
M
Tests/Foundation/CPInvocationOperationTest.j -
M
Tests/Foundation/CPKVOTest.j -
M
Tests/Foundation/CPOperationQueueTest.j -
M
Tests/Foundation/CPOperationTest.j -
M
Tests/Foundation/CPStringTest.j -
M
Tests/Foundation/CPSubclassableDictionaryTest.j -
M
Tests/Foundation/CPURLTest.j -
M
Tests/Manual/ArrayController1/AppController.j -
M
Tests/Manual/CPOutlineViewTest/AppController.j -
M
Tests/Manual/CPScrollView/AppController.j -
M
Tests/Manual/CPSearchField/AppController.j -
M
Tests/Manual/CPSearchField/Info.plist -
M
Tests/Manual/CPSearchField/index-debug.html -
M
Tests/Manual/CPSearchField/index.html -
M
Tests/Manual/CPSearchField/main.j -
M
Tests/Manual/SimpleBindings2/AppController.j -
M
Tests/Manual/TableTest/BorderTableTest/AppController.j -
M
Tests/Manual/TableTest/DrawRowTest/AppController.j -
M
Tests/Manual/TableTest/GroupRowTest/AppController.j -
M
Tests/Manual/TableTest/OldTest/AppController.j -
M
Tests/Manual/TableTest/VariableRows/AppController.j -
M
Tests/Manual/UndoRedoWithMenuUpdate/AppController.j -
M
Tools/capp/Configuration.j -
M
Tools/capp/Generate.j -
M
Tools/capp/main.j -
M
Tools/nib2cib/Converter.j -
M
Tools/nib2cib/NSArray.j -
M
Tools/nib2cib/NSButton.j -
M
Tools/nib2cib/NSClassSwapper.j -
M
Tools/nib2cib/NSClipView.j -
M
Tools/nib2cib/NSCollectionView.j -
M
Tools/nib2cib/NSColor.j -
M
Tools/nib2cib/NSColorWell.j -
M
Tools/nib2cib/NSControl.j -
M
Tools/nib2cib/NSCustomObject.j -
M
Tools/nib2cib/NSCustomView.j -
M
Tools/nib2cib/NSIBObjectData.j -
M
Tools/nib2cib/NSImageView.j -
M
Tools/nib2cib/NSMenu.j -
M
Tools/nib2cib/NSMenuItem.j -
M
Tools/nib2cib/NSOutlineView.j -
M
Tools/nib2cib/NSPopUpButton.j -
M
Tools/nib2cib/NSResponder.j -
M
Tools/nib2cib/NSScrollView.j -
M
Tools/nib2cib/NSScroller.j -
M
Tools/nib2cib/NSSegmentedControl.j -
M
Tools/nib2cib/NSSet.j -
M
Tools/nib2cib/NSSlider.j -
M
Tools/nib2cib/NSSplitView.j -
M
Tools/nib2cib/NSTableHeaderView.j -
M
Tools/nib2cib/NSTableView.j -
M
Tools/nib2cib/NSToolbar.j -
M
Tools/nib2cib/NSView.j -
M
Tools/nib2cib/NSViewController.j -
M
Tools/nib2cib/NSWindowTemplate.j -
M
Tools/nib2cib/WebView.j -
M
Tools/nib2cib/main.j