Changeset [87a2a6a534e3e29bb58d750013ce6ce2cb1d8e15] by Randall Luecke
Revision 87a2a6a534e3e29bb58d750013ce6ce2cb1d8e15,
committed by Randall Luecke
· December 4th, 2009 @ 09:28 AM
Merge branch 'jake' of git://github.com/280north/cappuccino into jake
Conflicts:
AppKit/CPTextField.j
http://github.com/280north/cappuccino/commit/87a2a6a534e3e29bb58d75...
32 changed files
-
A
AppKit/CPCursor.j -
A
AppKit/Resources/CPCursor/closedHandCursor.cur -
A
AppKit/Resources/CPCursor/contextualMenuCursor.cur -
A
AppKit/Resources/CPCursor/disappearingItemCursor.cur -
A
AppKit/Resources/CPCursor/dragCopyCursor.cur -
A
AppKit/Resources/CPCursor/dragLinkCursor.cur -
A
AppKit/Resources/CPCursor/openHandCursor.cur -
A
AppKit/Resources/CPCursor/resizeDownCursor.cur -
A
AppKit/Resources/CPCursor/resizeLeftCursor.cur -
A
AppKit/Resources/CPCursor/resizeRightCursor.cur -
A
AppKit/Resources/CPCursor/resizeUpCursor.cur -
A
AppKit/Resources/CPCursor/test.html -
A
Tests/CPCursor/AppController.j -
A
Tests/CPCursor/Info.plist -
A
Tests/CPCursor/Jakefile -
A
Tests/CPCursor/Resources/spinner.gif -
A
Tests/CPCursor/index-debug.html -
A
Tests/CPCursor/index.html -
A
Tests/CPCursor/main.j -
A
Tests/CPSearchField/AppController.j -
A
Tests/CPSearchField/Info.plist -
A
Tests/CPSearchField/index-debug.html -
A
Tests/CPSearchField/index.html -
A
Tests/CPSearchField/main.j -
M
AppKit/AppKit.j -
M
AppKit/CPApplication.j -
M
AppKit/CPDocument.j -
M
AppKit/CPMenu.j -
M
AppKit/CPSearchField.j -
M
AppKit/CPTextField.j -
M
AppKit/CPWebView.j -
M
AppKit/_CPImageAndTextView.j