Changeset [0a60aebcd6bffaa1385319738df2053145ad0389] by Ed Finkler
Revision 0a60aebcd6bffaa1385319738df2053145ad0389,
committed by Ed Finkler
· March 23rd, 2010 @ 09:28 PM
Merge branch 'master' into spazcoreprefs
Conflicts:
app/views/spaz.ui.js
http://github.com/funkatron/spaz-desktop-air/commit/0a60aebcd6bffaa...
5 changed files
-
A
vendors/jquery/jquery.tools.min.js -
M
app/views/spaz.ui.js -
M
application.xml -
M
html/notify.html -
M
vendors/purrjs.js