Changeset [05b1cfca31cb4a096db8ba06990e371d5d73bc0b] by Klaas Pieter Annema
Revision 05b1cfca31cb4a096db8ba06990e371d5d73bc0b,
committed by Klaas Pieter Annema
· January 23rd, 2010 @ 12:38 AM
Merge branch 'jake_original' into jake
Conflicts:
AppKit/CPTableView.j
http://github.com/280north/cappuccino/commit/05b1cfca31cb4a096db8ba...
18 changed files
-
M
AppKit/CPCursor.j -
M
AppKit/CPTableView.j -
M
AppKit/CPTextField.j -
M
AppKit/Jakefile -
M
AppKit/Platform/DOM/CPPlatform.j -
M
AppKit/Platform/DOM/CPPlatformString.j -
M
AppKit/Platform/DOM/CPPlatformWindow+DOM.j -
M
AppKit/Themes/Aristo/ThemeDescriptors.j -
M
Tests/Manual/CPCursor/index.html -
M
Tests/Manual/TableTest/AppController.j -
M
Tests/Manual/TableTest/index.html -
M
Tools/capp/Resources/Templates/Application/index-debug.html -
M
Tools/capp/Resources/Templates/Application/index.html -
M
Tools/capp/Resources/Templates/NibApplication/index-debug.html -
M
Tools/capp/Resources/Templates/NibApplication/index.html -
M
Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html -
M
Tools/capp/Resources/Templates/ThemeDescriptor/index.html -
M
common.jake