Changeset [37d9bff77f34b4cc291ec778c6e61fb8feec98e5] by Randall Luecke
November 26th, 2010 @ 12:44 PM
Merge branch 'master' into tableview-variable
Conflicts:
AppKit/CPTableView.j
https://github.com/280north/cappuccino/commit/37d9bff77f34b4cc291ec...
Committed by Randall Luecke
- A AppKit/CPSound.j
- A AppKit/Cib/CPCibBindingConnector.j
- A Tests/AppKit/CPKeyValueBindingSimpleBindingsTest.j
- A Tests/AppKit/Info.plist
- A Tests/AppKit/Resources/SimpleBindingsAdoption_03.cib
- A Tests/AppKit/Resources/SimpleBindingsAdoption_03.xib
- A Tests/Manual/CPSoundTest/AppController.j
- A Tests/Manual/CPSoundTest/Info.plist
- A Tests/Manual/CPSoundTest/Jakefile
- A Tests/Manual/CPSoundTest/Resources/31822_ihatetoregister_blip.README
- A Tests/Manual/CPSoundTest/Resources/31822_ihatetoregister_blip.mp3
- A Tests/Manual/CPSoundTest/Resources/spinner.gif
- A Tests/Manual/CPSoundTest/index-debug.html
- A Tests/Manual/CPSoundTest/index.html
- A Tests/Manual/CPSoundTest/main.j
- A Tools/nib2cib/NSArrayController.j
- A Tools/nib2cib/NSObjectController.j
- M AppKit/AppKit.j
- M AppKit/CPArrayController.j
- M AppKit/CPButton.j
- M AppKit/CPCollectionView.j
- M AppKit/CPKeyValueBinding.j
- M AppKit/CPObjectController.j
- M AppKit/CPTableColumn.j
- M AppKit/CPTableHeaderView.j
- M AppKit/CPTableView.j
- M AppKit/CPTextField.j
- M AppKit/CPTokenField.j
- M AppKit/Cib/_CPCibObjectData.j
- M AppKit/Themes/Aristo/ThemeDescriptors.j
- M Foundation/CPDecimal.j
- M Foundation/CPKeyValueCoding.j
- M Foundation/CPUndoManager.j
- M Tests/AppKit/CPArrayControllerTest.j
- M Tests/AppKit/CPCollectionViewTest.j
- M Tests/AppKit/CPKeyValueBindingTest.j
- M Tests/AppKit/CPTableViewTest.j
- M Tests/Foundation/CPKeyValueCodingTest.j
- M Tests/Manual/CPTabViewNib/Resources/MainMenu.cib
- M Tests/Manual/CPTokenFieldTest/AppController.j
- M Tools/nib2cib/NSAppKit.j
- M Tools/nib2cib/NSFormatter.j
- M Tools/nib2cib/NSNibConnector.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.