Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/update-copyright-year into lp:ubuntu-clock-app/saucy

  1. update-copyright-year
  2. Merge into saucy
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Riccardo Padovani
Approved revision: 318
Merged at revision: 319
Proposed branch: lp:~nik90/ubuntu-clock-app/update-copyright-year
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 249 lines (+54/-18)
20 files modified
alarm/AddAlarmPage.qml (+1/-1)
alarm/AlarmDays.qml (+1/-1)
alarm/AlarmFace.qml (+1/-1)
alarm/AlarmPage.qml (+1/-1)
clock/ClockPage.qml (+1/-1)
clock/EasterEgg.qml (+1/-1)
clock/SearchBox.qml (+1/-1)
clock/WorldClock.qml (+1/-1)
common/ClockBase.qml (+1/-1)
common/ClockUtils.js (+1/-1)
common/KeyboardShortcuts.js (+1/-1)
common/LabelDots.qml (+1/-1)
common/SettingsPage.qml (+18/-0)
stopwatch/Blip.qml (+18/-0)
stopwatch/StopwatchFace.qml (+1/-1)
stopwatch/StopwatchPage.qml (+1/-1)
timer/PresetList.qml (+1/-1)
timer/TimerFace.qml (+1/-1)
timer/TimerPage.qml (+1/-1)
ubuntu-clock-app.qml (+1/-1)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/update-copyright-year
Reviewer Review Type Date Requested Status
Riccardo Padovani Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+204380@code.launchpad.net

Commit message

Updated copyright of files that were changed this year 2014. Added missing copyright information to Blip and Settings files.

Description of the change

Updated copyright of files that were changed this year 2014. Added missing copyright information to Blip and Settings files.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:317
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/184/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/918
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/184
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/184
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/102

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/184/rebuild

review: Approve (continuous-integration)
lp:~nik90/ubuntu-clock-app/update-copyright-year updated
318. By Nekhelesh Ramananthan

revert copyright year change of files that didnt change this year

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:318
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/186/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/922
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/186
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/186
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/104

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/186/rebuild

review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'alarm/AddAlarmPage.qml'
--- alarm/AddAlarmPage.qml 2014-02-01 01:27:17 +0000
+++ alarm/AddAlarmPage.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'alarm/AlarmDays.qml'
--- alarm/AlarmDays.qml 2013-10-17 00:45:38 +0000
+++ alarm/AlarmDays.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright 2013 Canonical Ltd.2 * Copyright 2013, 2014 Canonical Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by5 * it under the terms of the GNU Lesser General Public License as published by
66
=== modified file 'alarm/AlarmFace.qml'
--- alarm/AlarmFace.qml 2014-01-13 18:54:02 +0000
+++ alarm/AlarmFace.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'alarm/AlarmPage.qml'
--- alarm/AlarmPage.qml 2014-01-13 18:54:02 +0000
+++ alarm/AlarmPage.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'clock/ClockPage.qml'
--- clock/ClockPage.qml 2014-01-29 21:15:01 +0000
+++ clock/ClockPage.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'clock/EasterEgg.qml'
--- clock/EasterEgg.qml 2014-01-12 00:57:48 +0000
+++ clock/EasterEgg.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'clock/SearchBox.qml'
--- clock/SearchBox.qml 2014-02-01 13:54:58 +0000
+++ clock/SearchBox.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'clock/WorldClock.qml'
--- clock/WorldClock.qml 2014-02-01 13:54:58 +0000
+++ clock/WorldClock.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'common/ClockBase.qml'
--- common/ClockBase.qml 2014-02-01 14:21:45 +0000
+++ common/ClockBase.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'common/ClockUtils.js'
--- common/ClockUtils.js 2014-01-30 21:23:33 +0000
+++ common/ClockUtils.js 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'common/KeyboardShortcuts.js'
--- common/KeyboardShortcuts.js 2014-02-01 13:54:58 +0000
+++ common/KeyboardShortcuts.js 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'common/LabelDots.qml'
--- common/LabelDots.qml 2013-11-18 02:04:44 +0000
+++ common/LabelDots.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'common/SettingsPage.qml'
--- common/SettingsPage.qml 2014-01-11 17:22:33 +0000
+++ common/SettingsPage.qml 2014-02-01 15:44:00 +0000
@@ -1,3 +1,21 @@
1/*
2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as
6 * published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
16 * Authored by: Nekhelesh Ramananthan <krnekhelesh@gmail.com>
17 */
18
1import QtQuick 2.019import QtQuick 2.0
2import Ubuntu.Components 0.120import Ubuntu.Components 0.1
3import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 0.1 as ListItem
422
=== modified file 'stopwatch/Blip.qml'
--- stopwatch/Blip.qml 2013-10-26 13:46:45 +0000
+++ stopwatch/Blip.qml 2014-02-01 15:44:00 +0000
@@ -1,3 +1,21 @@
1/*
2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as
6 * published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
16 * Authored by: Nekhelesh Ramananthan <krnekhelesh@gmail.com>
17 */
18
1import QtQuick 2.019import QtQuick 2.0
2import Ubuntu.Components 0.120import Ubuntu.Components 0.1
321
422
=== modified file 'stopwatch/StopwatchFace.qml'
--- stopwatch/StopwatchFace.qml 2014-01-15 20:17:46 +0000
+++ stopwatch/StopwatchFace.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'stopwatch/StopwatchPage.qml'
--- stopwatch/StopwatchPage.qml 2014-01-16 14:41:46 +0000
+++ stopwatch/StopwatchPage.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'timer/PresetList.qml'
--- timer/PresetList.qml 2014-01-30 21:08:57 +0000
+++ timer/PresetList.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'timer/TimerFace.qml'
--- timer/TimerFace.qml 2014-01-09 18:02:11 +0000
+++ timer/TimerFace.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml 2014-01-31 10:01:16 +0000
+++ timer/TimerPage.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as
66
=== modified file 'ubuntu-clock-app.qml'
--- ubuntu-clock-app.qml 2014-01-30 21:39:52 +0000
+++ ubuntu-clock-app.qml 2014-02-01 15:44:00 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2013 Canonical Ltd2 * Copyright (C) 2013, 2014 Canonical Ltd
3 *3 *
4 * This program is free software: you can redistribute it and/or modify4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 3 as5 * it under the terms of the GNU General Public License version 3 as

Subscribers

People subscribed via source and target branches