← Back to branch summary

~alexharrington/xibo/maintenance-alerts-v2

~alexharrington/xibo/maintenance-alerts-v2

Viewing all changes in revision 149.

Committer: Dan Garner
Date: 2010-06-13 21:17:50 UTC
mfrom: (148.1.4 server-120-rc1)
Revision ID: dan@xibo.org.uk-20100613211750-t2yequdki5rp4nev

Merged lp:~dangarner/xibo/server-120-rc1

files modified:
client/dotNET/Properties/Settings.Designer.cs

client/dotNET/Properties/Settings.settings

client/dotNET/app.config

server/install/database/23.sql

server/lib/modules/module.class.php

server/lib/pages/module.class.php

server/lib/pages/schedule.class.php

server/modules/embedded.module.php

server/modules/flash.module.php

server/modules/image.module.php

server/modules/microblog.module.php

server/modules/powerpoint.module.php

server/modules/text.module.php

server/modules/ticker.module.php

server/modules/video.module.php

server/modules/webpage.module.php

Show diffs side-by-side

added added

removed removed

client/dotNET/Properties/Settings.Designer.cs

client/dotNET/Properties/Settings.settings

client/dotNET/app.config

server/install/database/23.sql

server/lib/modules/module.class.php

server/lib/pages/module.class.php

server/lib/pages/schedule.class.php

server/modules/embedded.module.php

server/modules/flash.module.php

server/modules/image.module.php

server/modules/microblog.module.php

server/modules/powerpoint.module.php

server/modules/text.module.php

server/modules/ticker.module.php

server/modules/video.module.php

server/modules/webpage.module.php

Older »