~sergiusens/ubuntu-clock-app/reboot-packaging

Viewing all changes in revision 75.

  • Committer: Daniel Holbach
  • Date: 2014-08-11 11:24:24 UTC
  • mfrom: (37.5.3 reboot)
  • Revision ID: daniel.holbach@canonical.com-20140811112424-jzaf4zghstnkatja
merged lp:~nskaggs/ubuntu-clock-app/fix-ap-setup - resolve conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: