~dangarner/xibo/client-170-alpha2

Viewing all changes in revision 327.

  • Committer: Dan Garner
  • Date: 2014-04-29 17:19:56 UTC
  • mfrom: (324.1.1 xibo-head)
  • Revision ID: dan@xibo.org.uk-20140429171956-i14qbfawdpbve73r
Re-merge lp:xibo to fix diverged branch

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: