Changeset [cde5d8709cc601d9085cc3a96acdf19ebb77fd86] by Klaas Pieter Annema
Revision cde5d8709cc601d9085cc3a96acdf19ebb77fd86,
committed by Klaas Pieter Annema
· January 26th, 2010 @ 11:08 PM
Merge remote branch 'cappuccino/jake' into enstore_jake
Conflicts:
AppKit/CPTableView.j
http://github.com/280north/cappuccino/commit/cde5d8709cc601d9085cc3...
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