Changeset [0d1d1f9e370ea2162b07bee93a263b518abd8903] by Ed Finkler
Revision 0d1d1f9e370ea2162b07bee93a263b518abd8903,
committed by Ed Finkler
· March 1st, 2010 @ 10:32 AM
Merge branch 'master' into spazcoreprefs
Conflicts:
app/views/spaz.conversation.js
app/views/spaz.timelines.js
spazcore/spazcore-air.js
http://github.com/funkatron/spaz-desktop-air/commit/0d1d1f9e370ea21...
18 changed files
-
A
vendors/jquery/jquery.tinysort.js -
M
app/controllers/spaz.controller.js -
M
app/models/TwUserModel.js -
M
app/models/TweetModel.js -
M
app/models/spaz.data.js -
M
app/views/spaz.conversation.js -
M
app/views/spaz.keyboard.js -
M
app/views/spaz.postpanel.js -
M
app/views/spaz.timelines.js -
M
app/views/spaz.tooltip.js -
M
app/views/spaz.tpl.js -
M
app/views/spaz.ui.js -
M
application.xml -
M
css/init.css -
M
index.html -
M
spazcore/spazcore-air.js -
M
themes/Leopaz/theme.css -
M
themes/Leopaz/theme.js