Changeset [7c0243324faa7b19acce68fd0f7dc59e56ab354c] by Ed Finkler
Revision 7c0243324faa7b19acce68fd0f7dc59e56ab354c,
committed by Ed Finkler
· July 18th, 2010 @ 09:46 PM
Merge branch 'master' of github.com:funkatron/spaz-desktop-air
Conflicts:
app/views/spaz.postpanel.js
http://github.com/funkatron/spaz-desktop-air/commit/7c0243324faa7b1...
17 changed files
-
A
themes/Leopaz/images/refresh-white.png -
R
html/accounts.html -
M
app/controllers/spaz.controller.js -
M
app/models/spaz.data.js -
M
app/models/spaz.db.js -
M
app/models/spaz.prefs.js -
M
app/spaz.js -
M
app/views/spaz.accountprefs.js -
M
app/views/spaz.postpanel.js -
M
app/views/spaz.timelines.js -
M
app/views/spaz.ui.js -
M
app/views/spaz.windows.js -
M
css/init.css -
M
index.html -
M
spazcore/spazmenu.js -
M
themes/Leopaz/images/view-switches.png -
M
themes/Leopaz/theme.css