Changeset [f7a2a2e6fd0a65940232493433bcbe632c3b6f7d] by Alexander Ljungberg
Revision f7a2a2e6fd0a65940232493433bcbe632c3b6f7d,
committed by Alexander Ljungberg
· May 16th, 2011 @ 07:18 PM
Merge branch '0.9.1'
Conflicts:
Tools/nib2cib/NSFont.j
https://github.com/280north/cappuccino/commit/f7a2a2e6fd0a659402324...
22 changed files
-
A
Tests/Manual/NibAppRemixed/.xCodeSupport/NibAppRemixed.xcodeproj/project.pbxproj -
A
Tests/Manual/NibAppRemixed/.xCodeSupport/Sources/_Users_siker_dev_cappuccino_Tests_Manual_NibAppRemixed_AppController.h -
A
Tests/Manual/NibAppRemixed/AppController.j -
A
Tests/Manual/NibAppRemixed/Info.plist -
A
Tests/Manual/NibAppRemixed/Jakefile -
A
Tests/Manual/NibAppRemixed/Resources/MainMenu.cib -
A
Tests/Manual/NibAppRemixed/Resources/MainMenu.xib -
A
Tests/Manual/NibAppRemixed/Resources/spinner.gif -
A
Tests/Manual/NibAppRemixed/index-debug.html -
A
Tests/Manual/NibAppRemixed/index.html -
A
Tests/Manual/NibAppRemixed/main.j -
R
Tests/Manual/NibApp/AppController.j -
R
Tests/Manual/NibApp/AutoresizeTest.xib -
R
Tests/Manual/NibApp/MainMenu.cib -
R
Tests/Manual/NibApp/MainMenu.nib/designable.nib -
R
Tests/Manual/NibApp/MainMenu.nib/keyedobjects.nib -
R
Tests/Manual/NibApp/MainMenu.xib -
R
Tests/Manual/NibApp/Resources/spinner.gif -
R
Tests/Manual/NibApp/index.html -
R
Tests/Manual/NibApp/main.j -
R
Tests/Manual/NibApp/Info.plist -
M
Tools/nib2cib/NSFont.j