~alexharrington/xibo/pyclient-122-fix

Viewing all changes in revision 217.

  • Committer: Dan Garner
  • Date: 2011-02-28 19:30:26 UTC
  • Revision ID: dan@xibo.org.uk-20110228193026-vw46gzupa3w3slfx
[server] Fixed manual merge error

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: