Changeset [7fa01fa4f36ef3bdd0cefaaba8cc88e5a428bd2e] by Antoine Mercadal
Revision 7fa01fa4f36ef3bdd0cefaaba8cc88e5a428bd2e,
committed by Antoine Mercadal
· January 7th, 2013 @ 11:23 AM
Merge branch 'master' into Aristo2
Conflicts:
Tests/Manual/CPPopover/Resources/MainMenu.cib
https://github.com/cappuccino/cappuccino/commit/7fa01fa4f36ef3bdd0c...
6 changed files
-
M
AppKit/CPCompatibility.j -
M
AppKit/CPWindow/CPWindow.j -
M
AppKit/_CPAttachedWindow.j -
M
Foundation/CPRunLoop.j -
M
Foundation/CPTimer.j -
M
Tests/Manual/CPPopover/Resources/MainMenu.cib