Changeset [834311435cc9586f2d98114f73ad921cdcc2e5f7] by Randall Luecke
Revision 834311435cc9586f2d98114f73ad921cdcc2e5f7,
committed by Randall Luecke
· November 22nd, 2009 @ 07:23 PM
Merge branch 'jake' of git://github.com/280north/cappuccino into jake
Conflicts:
bootstrap.sh
http://github.com/280north/cappuccino/commit/834311435cc9586f2d9811...
7 changed files
-
A
AppKit/Resources/AboutPanel.cib -
A
AppKit/Resources/standardApplicationIcon.png -
M
AppKit/CPApplication.j -
M
AppKit/CPView.j -
M
Objective-J/CommonJS/lib/objective-j/compiler.js -
M
bootstrap.sh -
M
common.jake