Changeset [dd289e751dcf4c8006a60b60b5f20fc77be8d5bf] by Ed Finkler
January 15th, 2010 @ 09:29 AM
Merge branch 'master' into spazcoreprefs
Conflicts:
index.html
http://github.com/funkatron/spaz-desktop-air/commit/dd289e751dcf4c8...
Committed by Ed Finkler
- A themes/Leopaz/images/buttons/large-active.png
- A themes/Leopaz/images/buttons/large-disabled.png
- A themes/Leopaz/images/buttons/large.png
- A themes/Leopaz/images/buttons/small-active.png
- A themes/Leopaz/images/buttons/small-disabled.png
- A themes/Leopaz/images/buttons/small.png
- A themes/Leopaz/images/checkbox.png
- A vendors/jquery/jquery-1.4.js
- A vendors/jquery/jquery.compat-1.3.js
- R themes/Leopaz/images/button-bg.png
- R themes/Leopaz/images/prefs-panel-header-bg-active.png
- R themes/Leopaz/images/prefs-panel-header-bg.png
- M app/views/spaz.timelines.js
- M css/init.css
- M index.html
- M themes/Dumb Terminal/theme.css
- M themes/Leopaz/theme.css
- M themes/spaz-mini/theme.css
- M themes/spaz/theme.css
- M themes/whitespace/theme.css
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 Spaz Desktop project