Changeset [6fc02623df17879317ccd8e010d9f9433e558d15] by Francisco Ryan Tolmasky I

October 18th, 2009 @ 02:40 PM

Merge branch 'desktop' into jake

Conflicts:

Objective-J/CommonJS/objective-j/lib-js/objective-j.js

http://github.com/280north/cappuccino/commit/6fc02623df17879317ccd8...

Committed by Francisco Ryan Tolmasky I

  • A Tests/Foundation/CPDictionaryTest.j
  • M AppKit/CPApplication.j
  • M AppKit/CPCollectionView.j
  • M AppKit/CPWindow/CPWindow.j
  • M AppKit/Platform/CPPlatform.j
  • M Objective-J/CommonJS/objective-j/lib-js/objective-j.js
  • M Rakefile
  • M Tests/AppKit/CPCollectionViewTest.j
  • M Tests/Foundation/CPURLTest.j
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

The Cappuccino Web Framework, including AppKit, Foundation, and Objective-J.

Shared Ticket Bins