Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/update-branch-focus into lp:ubuntu-clock-app

  1. update-branch-focus
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 67
Merged at revision: 67
Proposed branch: lp:~nik90/ubuntu-clock-app/update-branch-focus
Merge into: lp:ubuntu-clock-app
Diff against target: 24 lines (+2/-1)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/update-branch-focus
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Sergio Schvezov (community) Approve
Ubuntu Clock Developers Pending
Review via email: mp+232197@code.launchpad.net

Commit message

Changed branch source from lp:ubuntu-clock-app/reboot to lp:ubuntu-clock-app in preparation for the launchpad development focus change.

Description of the change

Changed branch source from lp:ubuntu-clock-app/reboot to lp:ubuntu-clock-app in preparation for the launchpad development focus change.

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-08-20 21:53:02 +0000
3+++ CMakeLists.txt 2014-08-26 11:27:22 +0000
4@@ -43,7 +43,7 @@
5 )
6 endif(NOT BZR_REVNO)
7 if(NOT BZR_SOURCE)
8- set(BZR_SOURCE lp:${APP_HARDCODE}/reboot)
9+ set(BZR_SOURCE lp:${APP_HARDCODE})
10 message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
11 endif(NOT BZR_SOURCE)
12 else(CLICK_MODE)
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2014-08-25 09:59:19 +0000
16+++ debian/changelog 2014-08-26 11:27:22 +0000
17@@ -17,6 +17,7 @@
18 * Fixed tapping an alarm sound that is already selected toggles it
19 incorrectly (LP: #1360677)
20 * Updated QtQuick library imports to v2.3
21+ * Switched bzr branch to lp:ubuntu-clock-app
22
23 [Zsombor Egri]
24 * Fixed alarm status toggle being reverted immediately (LP: #1272337)

Subscribers

People subscribed via source and target branches