Changeset [24c0f2aedc6bf2630ffd13bd3ea509961425235a] by Aparajita Fishman
Revision 24c0f2aedc6bf2630ffd13bd3ea509961425235a,
committed by Aparajita Fishman
· January 18th, 2013 @ 10:15 PM
Merge branch 'refs/heads/inactive-window'
Conflicts:
AppKit/Themes/Aristo/ThemeDescriptors.j
AppKit/Themes/Aristo2/ThemeDescriptors.j
https://github.com/cappuccino/cappuccino/commit/24c0f2aedc6bf2630ff...
15 changed files
-
A
AppKit/Themes/Aristo2/Artwork/window-standard-button-unsaved.psd -
A
AppKit/Themes/Aristo2/Artwork/window-standard-close-button.psd -
A
AppKit/Themes/Aristo2/Resources/window-standard-button-unsaved-inactive.png -
A
AppKit/Themes/Aristo2/Resources/window-standard-close-button-inactive.png -
A
AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-center.png -
A
AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-left.png -
A
AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-right.png -
R
AppKit/Themes/Aristo2/Resources/Aristo-11-06-07_283.png -
M
AppKit/CPWindow/_CPStandardWindowView.j -
M
AppKit/Themes/Aristo/ThemeDescriptors.j -
M
AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd -
M
AppKit/Themes/Aristo2/Resources/window-standard-head-center.png -
M
AppKit/Themes/Aristo2/Resources/window-standard-head-left.png -
M
AppKit/Themes/Aristo2/Resources/window-standard-head-right.png -
M
AppKit/Themes/Aristo2/ThemeDescriptors.j