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
1=== modified file 'alarm/AddAlarmPage.qml'
2--- alarm/AddAlarmPage.qml 2014-02-01 01:27:17 +0000
3+++ alarm/AddAlarmPage.qml 2014-02-01 15:44:00 +0000
4@@ -1,5 +1,5 @@
5 /*
6- * Copyright (C) 2013 Canonical Ltd
7+ * Copyright (C) 2013, 2014 Canonical Ltd
8 *
9 * This program is free software: you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License version 3 as
11
12=== modified file 'alarm/AlarmDays.qml'
13--- alarm/AlarmDays.qml 2013-10-17 00:45:38 +0000
14+++ alarm/AlarmDays.qml 2014-02-01 15:44:00 +0000
15@@ -1,5 +1,5 @@
16 /*
17- * Copyright 2013 Canonical Ltd.
18+ * Copyright 2013, 2014 Canonical Ltd.
19 *
20 * This program is free software; you can redistribute it and/or modify
21 * it under the terms of the GNU Lesser General Public License as published by
22
23=== modified file 'alarm/AlarmFace.qml'
24--- alarm/AlarmFace.qml 2014-01-13 18:54:02 +0000
25+++ alarm/AlarmFace.qml 2014-02-01 15:44:00 +0000
26@@ -1,5 +1,5 @@
27 /*
28- * Copyright (C) 2013 Canonical Ltd
29+ * Copyright (C) 2013, 2014 Canonical Ltd
30 *
31 * This program is free software: you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License version 3 as
33
34=== modified file 'alarm/AlarmPage.qml'
35--- alarm/AlarmPage.qml 2014-01-13 18:54:02 +0000
36+++ alarm/AlarmPage.qml 2014-02-01 15:44:00 +0000
37@@ -1,5 +1,5 @@
38 /*
39- * Copyright (C) 2013 Canonical Ltd
40+ * Copyright (C) 2013, 2014 Canonical Ltd
41 *
42 * This program is free software: you can redistribute it and/or modify
43 * it under the terms of the GNU General Public License version 3 as
44
45=== modified file 'clock/ClockPage.qml'
46--- clock/ClockPage.qml 2014-01-29 21:15:01 +0000
47+++ clock/ClockPage.qml 2014-02-01 15:44:00 +0000
48@@ -1,5 +1,5 @@
49 /*
50- * Copyright (C) 2013 Canonical Ltd
51+ * Copyright (C) 2013, 2014 Canonical Ltd
52 *
53 * This program is free software: you can redistribute it and/or modify
54 * it under the terms of the GNU General Public License version 3 as
55
56=== modified file 'clock/EasterEgg.qml'
57--- clock/EasterEgg.qml 2014-01-12 00:57:48 +0000
58+++ clock/EasterEgg.qml 2014-02-01 15:44:00 +0000
59@@ -1,5 +1,5 @@
60 /*
61- * Copyright (C) 2013 Canonical Ltd
62+ * Copyright (C) 2013, 2014 Canonical Ltd
63 *
64 * This program is free software: you can redistribute it and/or modify
65 * it under the terms of the GNU General Public License version 3 as
66
67=== modified file 'clock/SearchBox.qml'
68--- clock/SearchBox.qml 2014-02-01 13:54:58 +0000
69+++ clock/SearchBox.qml 2014-02-01 15:44:00 +0000
70@@ -1,5 +1,5 @@
71 /*
72- * Copyright (C) 2013 Canonical Ltd
73+ * Copyright (C) 2013, 2014 Canonical Ltd
74 *
75 * This program is free software: you can redistribute it and/or modify
76 * it under the terms of the GNU General Public License version 3 as
77
78=== modified file 'clock/WorldClock.qml'
79--- clock/WorldClock.qml 2014-02-01 13:54:58 +0000
80+++ clock/WorldClock.qml 2014-02-01 15:44:00 +0000
81@@ -1,5 +1,5 @@
82 /*
83- * Copyright (C) 2013 Canonical Ltd
84+ * Copyright (C) 2013, 2014 Canonical Ltd
85 *
86 * This program is free software: you can redistribute it and/or modify
87 * it under the terms of the GNU General Public License version 3 as
88
89=== modified file 'common/ClockBase.qml'
90--- common/ClockBase.qml 2014-02-01 14:21:45 +0000
91+++ common/ClockBase.qml 2014-02-01 15:44:00 +0000
92@@ -1,5 +1,5 @@
93 /*
94- * Copyright (C) 2013 Canonical Ltd
95+ * Copyright (C) 2013, 2014 Canonical Ltd
96 *
97 * This program is free software: you can redistribute it and/or modify
98 * it under the terms of the GNU General Public License version 3 as
99
100=== modified file 'common/ClockUtils.js'
101--- common/ClockUtils.js 2014-01-30 21:23:33 +0000
102+++ common/ClockUtils.js 2014-02-01 15:44:00 +0000
103@@ -1,5 +1,5 @@
104 /*
105- * Copyright (C) 2013 Canonical Ltd
106+ * Copyright (C) 2013, 2014 Canonical Ltd
107 *
108 * This program is free software: you can redistribute it and/or modify
109 * it under the terms of the GNU General Public License version 3 as
110
111=== modified file 'common/KeyboardShortcuts.js'
112--- common/KeyboardShortcuts.js 2014-02-01 13:54:58 +0000
113+++ common/KeyboardShortcuts.js 2014-02-01 15:44:00 +0000
114@@ -1,5 +1,5 @@
115 /*
116- * Copyright (C) 2013 Canonical Ltd
117+ * Copyright (C) 2013, 2014 Canonical Ltd
118 *
119 * This program is free software: you can redistribute it and/or modify
120 * it under the terms of the GNU General Public License version 3 as
121
122=== modified file 'common/LabelDots.qml'
123--- common/LabelDots.qml 2013-11-18 02:04:44 +0000
124+++ common/LabelDots.qml 2014-02-01 15:44:00 +0000
125@@ -1,5 +1,5 @@
126 /*
127- * Copyright (C) 2013 Canonical Ltd
128+ * Copyright (C) 2013, 2014 Canonical Ltd
129 *
130 * This program is free software: you can redistribute it and/or modify
131 * it under the terms of the GNU General Public License version 3 as
132
133=== modified file 'common/SettingsPage.qml'
134--- common/SettingsPage.qml 2014-01-11 17:22:33 +0000
135+++ common/SettingsPage.qml 2014-02-01 15:44:00 +0000
136@@ -1,3 +1,21 @@
137+/*
138+ * Copyright (C) 2013, 2014 Canonical Ltd
139+ *
140+ * This program is free software: you can redistribute it and/or modify
141+ * it under the terms of the GNU General Public License version 3 as
142+ * published by the Free Software Foundation.
143+ *
144+ * This program is distributed in the hope that it will be useful,
145+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
146+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
147+ * GNU General Public License for more details.
148+ *
149+ * You should have received a copy of the GNU General Public License
150+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
151+ *
152+ * Authored by: Nekhelesh Ramananthan <krnekhelesh@gmail.com>
153+ */
154+
155 import QtQuick 2.0
156 import Ubuntu.Components 0.1
157 import Ubuntu.Components.ListItems 0.1 as ListItem
158
159=== modified file 'stopwatch/Blip.qml'
160--- stopwatch/Blip.qml 2013-10-26 13:46:45 +0000
161+++ stopwatch/Blip.qml 2014-02-01 15:44:00 +0000
162@@ -1,3 +1,21 @@
163+/*
164+ * Copyright (C) 2013, 2014 Canonical Ltd
165+ *
166+ * This program is free software: you can redistribute it and/or modify
167+ * it under the terms of the GNU General Public License version 3 as
168+ * published by the Free Software Foundation.
169+ *
170+ * This program is distributed in the hope that it will be useful,
171+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
172+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
173+ * GNU General Public License for more details.
174+ *
175+ * You should have received a copy of the GNU General Public License
176+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
177+ *
178+ * Authored by: Nekhelesh Ramananthan <krnekhelesh@gmail.com>
179+ */
180+
181 import QtQuick 2.0
182 import Ubuntu.Components 0.1
183
184
185=== modified file 'stopwatch/StopwatchFace.qml'
186--- stopwatch/StopwatchFace.qml 2014-01-15 20:17:46 +0000
187+++ stopwatch/StopwatchFace.qml 2014-02-01 15:44:00 +0000
188@@ -1,5 +1,5 @@
189 /*
190- * Copyright (C) 2013 Canonical Ltd
191+ * Copyright (C) 2013, 2014 Canonical Ltd
192 *
193 * This program is free software: you can redistribute it and/or modify
194 * it under the terms of the GNU General Public License version 3 as
195
196=== modified file 'stopwatch/StopwatchPage.qml'
197--- stopwatch/StopwatchPage.qml 2014-01-16 14:41:46 +0000
198+++ stopwatch/StopwatchPage.qml 2014-02-01 15:44:00 +0000
199@@ -1,5 +1,5 @@
200 /*
201- * Copyright (C) 2013 Canonical Ltd
202+ * Copyright (C) 2013, 2014 Canonical Ltd
203 *
204 * This program is free software: you can redistribute it and/or modify
205 * it under the terms of the GNU General Public License version 3 as
206
207=== modified file 'timer/PresetList.qml'
208--- timer/PresetList.qml 2014-01-30 21:08:57 +0000
209+++ timer/PresetList.qml 2014-02-01 15:44:00 +0000
210@@ -1,5 +1,5 @@
211 /*
212- * Copyright (C) 2013 Canonical Ltd
213+ * Copyright (C) 2013, 2014 Canonical Ltd
214 *
215 * This program is free software: you can redistribute it and/or modify
216 * it under the terms of the GNU General Public License version 3 as
217
218=== modified file 'timer/TimerFace.qml'
219--- timer/TimerFace.qml 2014-01-09 18:02:11 +0000
220+++ timer/TimerFace.qml 2014-02-01 15:44:00 +0000
221@@ -1,5 +1,5 @@
222 /*
223- * Copyright (C) 2013 Canonical Ltd
224+ * Copyright (C) 2013, 2014 Canonical Ltd
225 *
226 * This program is free software: you can redistribute it and/or modify
227 * it under the terms of the GNU General Public License version 3 as
228
229=== modified file 'timer/TimerPage.qml'
230--- timer/TimerPage.qml 2014-01-31 10:01:16 +0000
231+++ timer/TimerPage.qml 2014-02-01 15:44:00 +0000
232@@ -1,5 +1,5 @@
233 /*
234- * Copyright (C) 2013 Canonical Ltd
235+ * Copyright (C) 2013, 2014 Canonical Ltd
236 *
237 * This program is free software: you can redistribute it and/or modify
238 * it under the terms of the GNU General Public License version 3 as
239
240=== modified file 'ubuntu-clock-app.qml'
241--- ubuntu-clock-app.qml 2014-01-30 21:39:52 +0000
242+++ ubuntu-clock-app.qml 2014-02-01 15:44:00 +0000
243@@ -1,5 +1,5 @@
244 /*
245- * Copyright (C) 2013 Canonical Ltd
246+ * Copyright (C) 2013, 2014 Canonical Ltd
247 *
248 * This program is free software: you can redistribute it and/or modify
249 * it under the terms of the GNU General Public License version 3 as

Subscribers

People subscribed via source and target branches