Changeset [ac0d9db081da7526841c164d827f7519e6796aab] by Ed Finkler
May 9th, 2010 @ 08:31 PM
Merge http://github.com/alab1001101/spaz-desktop-air into alab
Conflicts:
app/models/spaz.prefs.js
app/views/spaz.timelines.js
http://github.com/funkatron/spaz-desktop-air/commit/ac0d9db081da752...
Committed by Ed Finkler
- M app/models/spaz.prefs.js
- M app/views/spaz.timelines.js
- M app/views/spaz.ui.js
- M index.html
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