Changeset [b80c48886aa3b2b2d1c7fef28e932d97852bebb3] by Ross Boucher
Revision b80c48886aa3b2b2d1c7fef28e932d97852bebb3,
committed by Ross Boucher
· December 8th, 2010 @ 11:23 AM
Merge branch 'cpbutton-rounded-bezel-style-support' of https://github.com/primalmotion/cappuccino into primalmotion-cpbutton-rounded-bezel-style-support
Conflicts:
AppKit/Themes/Aristo/ThemeDescriptors.j
https://github.com/280north/cappuccino/commit/b80c48886aa3b2b2d1c7f...
20 changed files
-
A
AppKit/Themes/Aristo/Resources/button-bezel-rounded-center.png -
A
AppKit/Themes/Aristo/Resources/button-bezel-rounded-disabled-center.png -
A
AppKit/Themes/Aristo/Resources/button-bezel-rounded-disabled-left.png -
A
AppKit/Themes/Aristo/Resources/button-bezel-rounded-disabled-right.png -
A
AppKit/Themes/Aristo/Resources/button-bezel-rounded-highlighted-center.png -
A
AppKit/Themes/Aristo/Resources/button-bezel-rounded-highlighted-left.png -
A
AppKit/Themes/Aristo/Resources/button-bezel-rounded-highlighted-right.png -
A
AppKit/Themes/Aristo/Resources/button-bezel-rounded-left.png -
A
AppKit/Themes/Aristo/Resources/button-bezel-rounded-right.png -
A
AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-center.png -
A
AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-disabled-center.png -
A
AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-disabled-left.png -
A
AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-disabled-right.png -
A
AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-highlighted-center.png -
A
AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-highlighted-left.png -
A
AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-highlighted-right.png -
A
AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-left.png -
A
AppKit/Themes/Aristo/Resources/default-button-bezel-rounded-right.png -
M
AppKit/CPButton.j -
M
AppKit/Themes/Aristo/ThemeDescriptors.j