Changeset [7f05164a7f894bebc8794b29c953a23ff91bc3ca] by Alexandre Wilhelm
Revision 7f05164a7f894bebc8794b29c953a23ff91bc3ca,
committed by Alexandre Wilhelm
· January 8th, 2013 @ 02:24 PM
Merge branch 'Aristo2' of
github.mv.usa.alcatel.com:amercada/Cappuccino into Aristo2
https://github.com/cappuccino/cappuccino/commit/7f05164a7f894bebc87...
36 changed files
-
A
AppKit/Themes/Aristo2/Resources/Aristo-HUD 11-06-07.psd -
A
Tests/Manual/CPSegmentedControlTest/AppController.j -
A
Tests/Manual/CPSegmentedControlTest/CPSegmentedControlTest.xcodeproj/project.pbxproj -
A
Tests/Manual/CPSegmentedControlTest/CPSegmentedControlTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata -
A
Tests/Manual/CPSegmentedControlTest/Info.plist -
A
Tests/Manual/CPSegmentedControlTest/Jakefile -
A
Tests/Manual/CPSegmentedControlTest/Resources/MainMenu.cib -
A
Tests/Manual/CPSegmentedControlTest/Resources/MainMenu.xib -
A
Tests/Manual/CPSegmentedControlTest/Resources/spinner.gif -
A
Tests/Manual/CPSegmentedControlTest/index-debug.html -
A
Tests/Manual/CPSegmentedControlTest/index.html -
A
Tests/Manual/CPSegmentedControlTest/main.j -
M
.gitignore -
M
AppKit/CPApplication.j -
M
AppKit/CPBox.j -
M
AppKit/CPCompatibility.j -
M
AppKit/CPMenu/_CPMenuBarWindow.j -
M
AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j -
M
AppKit/CPSegmentedControl.j -
M
AppKit/CPWindow/CPWindow.j -
M
AppKit/Jakefile -
M
AppKit/Themes/Aristo2/ThemeDescriptors.j -
M
AppKit/Themes/Jakefile -
M
AppKit/_CPAttachedWindow.j -
M
CommonJS/bin/flatten -
M
CommonJS/bin/press -
M
Foundation/CPRunLoop.j -
M
Foundation/CPTimer.j -
M
Foundation/CPURL.j -
M
Jakefile -
M
Tests/Manual/CPBoxTest/AppController.j -
M
Tests/Manual/CPBoxTest/Resources/MainMenu.cib -
M
Tests/Manual/CPBoxTest/Resources/MainMenu.xib -
M
Tests/Manual/CPPopover/Resources/MainMenu.cib -
M
Tools/nib2cib/NSBox.j -
M
Tools/nib2cib/NSSegmentedControl.j