Merge lp:~dpm/reminders-app/fix-1317977-openssl-exception into lp:reminders-app
- fix-1317977-openssl-exception
- Merge into trunk
Status: | Superseded |
---|---|
Proposed branch: | lp:~dpm/reminders-app/fix-1317977-openssl-exception |
Merge into: | lp:reminders-app |
Diff against target: |
2162 lines (+1229/-25) 82 files modified
debian/copyright (+14/-2) src/app/camerahelper.cpp (+14/-0) src/app/camerahelper.h (+14/-0) src/app/main.cpp (+14/-0) src/app/preferences.cpp (+14/-0) src/app/preferences.h (+14/-0) src/app/qml/components/NotebooksDelegate.qml (+14/-0) src/app/qml/components/NotesDelegate.qml (+14/-0) src/app/qml/components/RemindersDelegate.qml (+14/-0) src/app/qml/components/ToolbarSpacer.qml (+14/-0) src/app/qml/reminders.qml (+15/-1) src/app/qml/ui/AccountSelectorPage.qml (+14/-0) src/app/qml/ui/CameraComponents/CameraToolbar.qml (+14/-0) src/app/qml/ui/CameraComponents/CameraToolbarButton.qml (+14/-0) src/app/qml/ui/CameraComponents/CrossFadingButton.qml (+14/-0) src/app/qml/ui/CameraComponents/FadingButton.qml (+14/-0) src/app/qml/ui/CameraComponents/FlashButton.qml (+14/-0) src/app/qml/ui/CameraComponents/ThinSliderStyle.qml (+14/-0) src/app/qml/ui/CameraComponents/ViewFinderGeometry.qml (+14/-0) src/app/qml/ui/CameraComponents/ZoomControl.qml (+14/-0) src/app/qml/ui/CameraComponents/constants.js (+14/-0) src/app/qml/ui/CameraConfirm.qml (+14/-0) src/app/qml/ui/CameraPage.qml (+14/-0) src/app/qml/ui/EditNotePage.qml (+14/-0) src/app/qml/ui/EditNoteView.qml (+14/-0) src/app/qml/ui/NotePage.qml (+14/-0) src/app/qml/ui/NoteView.qml (+14/-0) src/app/qml/ui/NotebooksPage.qml (+14/-0) src/app/qml/ui/NotesPage.qml (+14/-0) src/app/qml/ui/RemindersPage.qml (+14/-0) src/app/qml/ui/SearchNotesPage.qml (+14/-0) src/app/qml/ui/SetReminderPage.qml (+14/-0) src/app/qml/ui/SetReminderView.qml (+14/-0) src/app/qml/ui/reminders-scripts.js (+32/-0) src/plugin/Evernote/evernoteconnection.cpp (+14/-0) src/plugin/Evernote/evernoteconnection.h (+14/-0) src/plugin/Evernote/evernoteplugin.cpp (+14/-0) src/plugin/Evernote/evernoteplugin.h (+36/-22) src/plugin/Evernote/jobs/createnotebookjob.cpp (+14/-0) src/plugin/Evernote/jobs/createnotebookjob.h (+14/-0) src/plugin/Evernote/jobs/createnotejob.cpp (+14/-0) src/plugin/Evernote/jobs/createnotejob.h (+14/-0) src/plugin/Evernote/jobs/deletenotejob.cpp (+14/-0) src/plugin/Evernote/jobs/deletenotejob.h (+14/-0) src/plugin/Evernote/jobs/evernotejob.cpp (+14/-0) src/plugin/Evernote/jobs/evernotejob.h (+14/-0) src/plugin/Evernote/jobs/expungenotebookjob.cpp (+14/-0) src/plugin/Evernote/jobs/expungenotebookjob.h (+14/-0) src/plugin/Evernote/jobs/fetchnotebooksjob.cpp (+14/-0) src/plugin/Evernote/jobs/fetchnotebooksjob.h (+14/-0) src/plugin/Evernote/jobs/fetchnotejob.cpp (+14/-0) src/plugin/Evernote/jobs/fetchnotejob.h (+14/-0) src/plugin/Evernote/jobs/fetchnotesjob.cpp (+14/-0) src/plugin/Evernote/jobs/fetchnotesjob.h (+14/-0) src/plugin/Evernote/jobs/fetchusernamejob.cpp (+14/-0) src/plugin/Evernote/jobs/fetchusernamejob.h (+14/-0) src/plugin/Evernote/jobs/notesstorejob.cpp (+14/-0) src/plugin/Evernote/jobs/notesstorejob.h (+14/-0) src/plugin/Evernote/jobs/savenotejob.cpp (+14/-0) src/plugin/Evernote/jobs/savenotejob.h (+14/-0) src/plugin/Evernote/jobs/userstorejob.cpp (+14/-0) src/plugin/Evernote/jobs/userstorejob.h (+14/-0) src/plugin/Evernote/note.cpp (+14/-0) src/plugin/Evernote/note.h (+14/-0) src/plugin/Evernote/notebook.cpp (+14/-0) src/plugin/Evernote/notebook.h (+14/-0) src/plugin/Evernote/notebooks.cpp (+14/-0) src/plugin/Evernote/notebooks.h (+14/-0) src/plugin/Evernote/notes.cpp (+14/-0) src/plugin/Evernote/notes.h (+14/-0) src/plugin/Evernote/notesstore.cpp (+14/-0) src/plugin/Evernote/notesstore.h (+14/-0) src/plugin/Evernote/resource.cpp (+14/-0) src/plugin/Evernote/resource.h (+14/-0) src/plugin/Evernote/resourceimageprovider.cpp (+34/-0) src/plugin/Evernote/resourceimageprovider.h (+34/-0) src/plugin/Evernote/userstore.cpp (+14/-0) src/plugin/Evernote/userstore.h (+14/-0) src/plugin/Evernote/utils/enmldocument.cpp (+14/-0) src/plugin/Evernote/utils/enmldocument.h (+14/-0) src/plugin/Evernote/utils/textformat.cpp (+14/-0) src/plugin/Evernote/utils/textformat.h (+14/-0) |
To merge this branch: | bzr merge lp:~dpm/reminders-app/fix-1317977-openssl-exception |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
David Planella | Needs Fixing | ||
Michael Zanetti (community) | Needs Information | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Daniel Holbach | Pending | ||
Dimitri John Ledkov | Pending | ||
Review via email: mp+219037@code.launchpad.net |
This proposal has been superseded by a proposal from 2014-05-12.
Commit message
Add OpenSSL linking exception.
Description of the change
Add OpenSSL linking exception.
David Planella (dpm) wrote : | # |
David Planella (dpm) wrote : | # |
Now ready for review.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:134
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Michael Zanetti (mzanetti) wrote : | # |
Do we really need to have this in each and every copyright header? I've never seen it like this before. Imo having that clause in the main license file should be enough, no?
David Planella (dpm) wrote : | # |
So it seems it's enough to have the notice in debian/copyright for the .deb package. For click packages we don't have a good solution, but we can add a COPYING or LICENSE file with the additional clause and ship it with the click package.
Unmerged revisions
- 134. By David Planella
-
Updated debian copyright with the new license exception
- 133. By David Planella
-
Updated all files with the new license exception
- 132. By David Planella
-
Initial addition of the OpenSSL linking exception
Preview Diff
1 | === modified file 'debian/copyright' |
2 | --- debian/copyright 2013-11-26 17:18:33 +0000 |
3 | +++ debian/copyright 2014-05-09 18:12:38 +0000 |
4 | @@ -4,17 +4,29 @@ |
5 | |
6 | Files: * |
7 | Copyright: 2013 Canonical Ltd. |
8 | -License: GPL-3 |
9 | +License: GPL-3 with OpenSSL exception |
10 | |
11 | Files: debian/* |
12 | Copyright: 2013 Canonical Ltd. |
13 | License: LGPL-3 |
14 | |
15 | -License: GPL-3 |
16 | +License: GPL-3 with OpenSSL exception |
17 | This package is free software; you can redistribute it and/or |
18 | modify it under the terms of the GNU General Public |
19 | License as published by the Free Software Foundation; version 3. |
20 | . |
21 | + In addition, as a special exception, the author of this |
22 | + program gives permission to link the code of its |
23 | + release with the OpenSSL project's "OpenSSL" library (or |
24 | + with modified versions of it that use the same license as |
25 | + the "OpenSSL" library), and distribute the linked |
26 | + executables. You must obey the GNU General Public |
27 | + License in all respects for all of the code used other |
28 | + than "OpenSSL". If you modify this file, you may extend |
29 | + this exception to your version of the file, but you are |
30 | + not obligated to do so. If you do not wish to do so, |
31 | + delete this exception statement from your version. |
32 | + . |
33 | This package is distributed in the hope that it will be useful, |
34 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
35 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
36 | |
37 | === modified file 'src/app/camerahelper.cpp' |
38 | --- src/app/camerahelper.cpp 2014-05-06 09:07:08 +0000 |
39 | +++ src/app/camerahelper.cpp 2014-05-09 18:12:38 +0000 |
40 | @@ -16,6 +16,20 @@ |
41 | * You should have received a copy of the GNU General Public License |
42 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
43 | * |
44 | + * In addition, as a special exception, the copyright holders give |
45 | + * permission to link the code of portions of this program with the |
46 | + * OpenSSL library under certain conditions as described in each |
47 | + * individual source file, and distribute linked combinations |
48 | + * including the two. |
49 | + * |
50 | + * You must obey the GNU General Public License in all respects |
51 | + * for all of the code used other than OpenSSL. If you modify |
52 | + * file(s) with this exception, you may extend this exception to your |
53 | + * version of the file(s), but you are not obligated to do so. If you |
54 | + * do not wish to do so, delete this exception statement from your |
55 | + * version. If you delete this exception statement from all source |
56 | + * files in the program, then also delete it here. |
57 | + * |
58 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
59 | * Riccardo Padovani <rpadovani@ubuntu.com> |
60 | */ |
61 | |
62 | === modified file 'src/app/camerahelper.h' |
63 | --- src/app/camerahelper.h 2014-02-27 12:06:05 +0000 |
64 | +++ src/app/camerahelper.h 2014-05-09 18:12:38 +0000 |
65 | @@ -13,6 +13,20 @@ |
66 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
67 | * GNU General Public License for more details. |
68 | * |
69 | + * In addition, as a special exception, the copyright holders give |
70 | + * permission to link the code of portions of this program with the |
71 | + * OpenSSL library under certain conditions as described in each |
72 | + * individual source file, and distribute linked combinations |
73 | + * including the two. |
74 | + * |
75 | + * You must obey the GNU General Public License in all respects |
76 | + * for all of the code used other than OpenSSL. If you modify |
77 | + * file(s) with this exception, you may extend this exception to your |
78 | + * version of the file(s), but you are not obligated to do so. If you |
79 | + * do not wish to do so, delete this exception statement from your |
80 | + * version. If you delete this exception statement from all source |
81 | + * files in the program, then also delete it here. |
82 | + * |
83 | * You should have received a copy of the GNU General Public License |
84 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
85 | * |
86 | |
87 | === modified file 'src/app/main.cpp' |
88 | --- src/app/main.cpp 2014-05-06 19:55:05 +0000 |
89 | +++ src/app/main.cpp 2014-05-09 18:12:38 +0000 |
90 | @@ -16,6 +16,20 @@ |
91 | * You should have received a copy of the GNU General Public License |
92 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
93 | * |
94 | + * In addition, as a special exception, the copyright holders give |
95 | + * permission to link the code of portions of this program with the |
96 | + * OpenSSL library under certain conditions as described in each |
97 | + * individual source file, and distribute linked combinations |
98 | + * including the two. |
99 | + * |
100 | + * You must obey the GNU General Public License in all respects |
101 | + * for all of the code used other than OpenSSL. If you modify |
102 | + * file(s) with this exception, you may extend this exception to your |
103 | + * version of the file(s), but you are not obligated to do so. If you |
104 | + * do not wish to do so, delete this exception statement from your |
105 | + * version. If you delete this exception statement from all source |
106 | + * files in the program, then also delete it here. |
107 | + * |
108 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
109 | * Riccardo Padovani <rpadovani@ubuntu.com> |
110 | */ |
111 | |
112 | === modified file 'src/app/preferences.cpp' |
113 | --- src/app/preferences.cpp 2014-05-05 18:00:28 +0000 |
114 | +++ src/app/preferences.cpp 2014-05-09 18:12:38 +0000 |
115 | @@ -16,6 +16,20 @@ |
116 | * You should have received a copy of the GNU General Public License |
117 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
118 | * |
119 | + * In addition, as a special exception, the copyright holders give |
120 | + * permission to link the code of portions of this program with the |
121 | + * OpenSSL library under certain conditions as described in each |
122 | + * individual source file, and distribute linked combinations |
123 | + * including the two. |
124 | + * |
125 | + * You must obey the GNU General Public License in all respects |
126 | + * for all of the code used other than OpenSSL. If you modify |
127 | + * file(s) with this exception, you may extend this exception to your |
128 | + * version of the file(s), but you are not obligated to do so. If you |
129 | + * do not wish to do so, delete this exception statement from your |
130 | + * version. If you delete this exception statement from all source |
131 | + * files in the program, then also delete it here. |
132 | + * |
133 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
134 | * Riccardo Padovani <rpadovani@ubuntu.com> |
135 | */ |
136 | |
137 | === modified file 'src/app/preferences.h' |
138 | --- src/app/preferences.h 2014-05-05 18:00:28 +0000 |
139 | +++ src/app/preferences.h 2014-05-09 18:12:38 +0000 |
140 | @@ -16,6 +16,20 @@ |
141 | * You should have received a copy of the GNU General Public License |
142 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
143 | * |
144 | + * In addition, as a special exception, the copyright holders give |
145 | + * permission to link the code of portions of this program with the |
146 | + * OpenSSL library under certain conditions as described in each |
147 | + * individual source file, and distribute linked combinations |
148 | + * including the two. |
149 | + * |
150 | + * You must obey the GNU General Public License in all respects |
151 | + * for all of the code used other than OpenSSL. If you modify |
152 | + * file(s) with this exception, you may extend this exception to your |
153 | + * version of the file(s), but you are not obligated to do so. If you |
154 | + * do not wish to do so, delete this exception statement from your |
155 | + * version. If you delete this exception statement from all source |
156 | + * files in the program, then also delete it here. |
157 | + * |
158 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
159 | * Riccardo Padovani <rpadovani@ubuntu.com> |
160 | */ |
161 | |
162 | === modified file 'src/app/qml/components/NotebooksDelegate.qml' |
163 | --- src/app/qml/components/NotebooksDelegate.qml 2014-05-07 19:11:05 +0000 |
164 | +++ src/app/qml/components/NotebooksDelegate.qml 2014-05-09 18:12:38 +0000 |
165 | @@ -14,6 +14,20 @@ |
166 | * |
167 | * You should have received a copy of the GNU General Public License |
168 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
169 | + * |
170 | + * In addition, as a special exception, the copyright holders give |
171 | + * permission to link the code of portions of this program with the |
172 | + * OpenSSL library under certain conditions as described in each |
173 | + * individual source file, and distribute linked combinations |
174 | + * including the two. |
175 | + * |
176 | + * You must obey the GNU General Public License in all respects |
177 | + * for all of the code used other than OpenSSL. If you modify |
178 | + * file(s) with this exception, you may extend this exception to your |
179 | + * version of the file(s), but you are not obligated to do so. If you |
180 | + * do not wish to do so, delete this exception statement from your |
181 | + * version. If you delete this exception statement from all source |
182 | + * files in the program, then also delete it here. |
183 | */ |
184 | |
185 | import QtQuick 2.0 |
186 | |
187 | === modified file 'src/app/qml/components/NotesDelegate.qml' |
188 | --- src/app/qml/components/NotesDelegate.qml 2014-05-09 15:02:17 +0000 |
189 | +++ src/app/qml/components/NotesDelegate.qml 2014-05-09 18:12:38 +0000 |
190 | @@ -14,6 +14,20 @@ |
191 | * |
192 | * You should have received a copy of the GNU General Public License |
193 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
194 | + * |
195 | + * In addition, as a special exception, the copyright holders give |
196 | + * permission to link the code of portions of this program with the |
197 | + * OpenSSL library under certain conditions as described in each |
198 | + * individual source file, and distribute linked combinations |
199 | + * including the two. |
200 | + * |
201 | + * You must obey the GNU General Public License in all respects |
202 | + * for all of the code used other than OpenSSL. If you modify |
203 | + * file(s) with this exception, you may extend this exception to your |
204 | + * version of the file(s), but you are not obligated to do so. If you |
205 | + * do not wish to do so, delete this exception statement from your |
206 | + * version. If you delete this exception statement from all source |
207 | + * files in the program, then also delete it here. |
208 | */ |
209 | |
210 | import QtQuick 2.0 |
211 | |
212 | === modified file 'src/app/qml/components/RemindersDelegate.qml' |
213 | --- src/app/qml/components/RemindersDelegate.qml 2014-05-08 19:44:16 +0000 |
214 | +++ src/app/qml/components/RemindersDelegate.qml 2014-05-09 18:12:38 +0000 |
215 | @@ -14,6 +14,20 @@ |
216 | * |
217 | * You should have received a copy of the GNU General Public License |
218 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
219 | + * |
220 | + * In addition, as a special exception, the copyright holders give |
221 | + * permission to link the code of portions of this program with the |
222 | + * OpenSSL library under certain conditions as described in each |
223 | + * individual source file, and distribute linked combinations |
224 | + * including the two. |
225 | + * |
226 | + * You must obey the GNU General Public License in all respects |
227 | + * for all of the code used other than OpenSSL. If you modify |
228 | + * file(s) with this exception, you may extend this exception to your |
229 | + * version of the file(s), but you are not obligated to do so. If you |
230 | + * do not wish to do so, delete this exception statement from your |
231 | + * version. If you delete this exception statement from all source |
232 | + * files in the program, then also delete it here. |
233 | */ |
234 | |
235 | import QtQuick 2.0 |
236 | |
237 | === modified file 'src/app/qml/components/ToolbarSpacer.qml' |
238 | --- src/app/qml/components/ToolbarSpacer.qml 2014-01-27 13:00:41 +0000 |
239 | +++ src/app/qml/components/ToolbarSpacer.qml 2014-05-09 18:12:38 +0000 |
240 | @@ -14,6 +14,20 @@ |
241 | * |
242 | * You should have received a copy of the GNU General Public License |
243 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
244 | + * |
245 | + * In addition, as a special exception, the copyright holders give |
246 | + * permission to link the code of portions of this program with the |
247 | + * OpenSSL library under certain conditions as described in each |
248 | + * individual source file, and distribute linked combinations |
249 | + * including the two. |
250 | + * |
251 | + * You must obey the GNU General Public License in all respects |
252 | + * for all of the code used other than OpenSSL. If you modify |
253 | + * file(s) with this exception, you may extend this exception to your |
254 | + * version of the file(s), but you are not obligated to do so. If you |
255 | + * do not wish to do so, delete this exception statement from your |
256 | + * version. If you delete this exception statement from all source |
257 | + * files in the program, then also delete it here. |
258 | */ |
259 | |
260 | import QtQuick 2.0 |
261 | |
262 | === modified file 'src/app/qml/reminders.qml' |
263 | --- src/app/qml/reminders.qml 2014-05-09 09:49:47 +0000 |
264 | +++ src/app/qml/reminders.qml 2014-05-09 18:12:38 +0000 |
265 | @@ -14,13 +14,27 @@ |
266 | * |
267 | * You should have received a copy of the GNU General Public License |
268 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
269 | + * |
270 | + * In addition, as a special exception, the copyright holders give |
271 | + * permission to link the code of portions of this program with the |
272 | + * OpenSSL library under certain conditions as described in each |
273 | + * individual source file, and distribute linked combinations |
274 | + * including the two. |
275 | + * |
276 | + * You must obey the GNU General Public License in all respects |
277 | + * for all of the code used other than OpenSSL. If you modify |
278 | + * file(s) with this exception, you may extend this exception to your |
279 | + * version of the file(s), but you are not obligated to do so. If you |
280 | + * do not wish to do so, delete this exception statement from your |
281 | + * version. If you delete this exception statement from all source |
282 | + * files in the program, then also delete it here. |
283 | + * |
284 | */ |
285 | |
286 | import QtQuick 2.0 |
287 | import Ubuntu.Components 0.1 |
288 | import Ubuntu.Components.Popups 0.1 |
289 | import Ubuntu.Components.ListItems 0.1 |
290 | -//import "components" |
291 | import "ui" |
292 | import Evernote 0.1 |
293 | import Ubuntu.OnlineAccounts 0.1 |
294 | |
295 | === modified file 'src/app/qml/ui/AccountSelectorPage.qml' |
296 | --- src/app/qml/ui/AccountSelectorPage.qml 2014-03-13 18:11:32 +0000 |
297 | +++ src/app/qml/ui/AccountSelectorPage.qml 2014-05-09 18:12:38 +0000 |
298 | @@ -14,6 +14,20 @@ |
299 | * |
300 | * You should have received a copy of the GNU General Public License |
301 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
302 | + * |
303 | + * In addition, as a special exception, the copyright holders give |
304 | + * permission to link the code of portions of this program with the |
305 | + * OpenSSL library under certain conditions as described in each |
306 | + * individual source file, and distribute linked combinations |
307 | + * including the two. |
308 | + * |
309 | + * You must obey the GNU General Public License in all respects |
310 | + * for all of the code used other than OpenSSL. If you modify |
311 | + * file(s) with this exception, you may extend this exception to your |
312 | + * version of the file(s), but you are not obligated to do so. If you |
313 | + * do not wish to do so, delete this exception statement from your |
314 | + * version. If you delete this exception statement from all source |
315 | + * files in the program, then also delete it here. |
316 | */ |
317 | |
318 | import QtQuick 2.0 |
319 | |
320 | === modified file 'src/app/qml/ui/CameraComponents/CameraToolbar.qml' |
321 | --- src/app/qml/ui/CameraComponents/CameraToolbar.qml 2014-02-25 15:07:24 +0000 |
322 | +++ src/app/qml/ui/CameraComponents/CameraToolbar.qml 2014-05-09 18:12:38 +0000 |
323 | @@ -12,6 +12,20 @@ |
324 | * |
325 | * You should have received a copy of the GNU General Public License |
326 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
327 | + * |
328 | + * In addition, as a special exception, the copyright holders give |
329 | + * permission to link the code of portions of this program with the |
330 | + * OpenSSL library under certain conditions as described in each |
331 | + * individual source file, and distribute linked combinations |
332 | + * including the two. |
333 | + * |
334 | + * You must obey the GNU General Public License in all respects |
335 | + * for all of the code used other than OpenSSL. If you modify |
336 | + * file(s) with this exception, you may extend this exception to your |
337 | + * version of the file(s), but you are not obligated to do so. If you |
338 | + * do not wish to do so, delete this exception statement from your |
339 | + * version. If you delete this exception statement from all source |
340 | + * files in the program, then also delete it here. |
341 | */ |
342 | |
343 | import QtQuick 2.0 |
344 | |
345 | === modified file 'src/app/qml/ui/CameraComponents/CameraToolbarButton.qml' |
346 | --- src/app/qml/ui/CameraComponents/CameraToolbarButton.qml 2014-02-19 00:05:24 +0000 |
347 | +++ src/app/qml/ui/CameraComponents/CameraToolbarButton.qml 2014-05-09 18:12:38 +0000 |
348 | @@ -12,6 +12,20 @@ |
349 | * |
350 | * You should have received a copy of the GNU General Public License |
351 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
352 | + * |
353 | + * In addition, as a special exception, the copyright holders give |
354 | + * permission to link the code of portions of this program with the |
355 | + * OpenSSL library under certain conditions as described in each |
356 | + * individual source file, and distribute linked combinations |
357 | + * including the two. |
358 | + * |
359 | + * You must obey the GNU General Public License in all respects |
360 | + * for all of the code used other than OpenSSL. If you modify |
361 | + * file(s) with this exception, you may extend this exception to your |
362 | + * version of the file(s), but you are not obligated to do so. If you |
363 | + * do not wish to do so, delete this exception statement from your |
364 | + * version. If you delete this exception statement from all source |
365 | + * files in the program, then also delete it here. |
366 | */ |
367 | |
368 | import QtQuick 2.0 |
369 | |
370 | === modified file 'src/app/qml/ui/CameraComponents/CrossFadingButton.qml' |
371 | --- src/app/qml/ui/CameraComponents/CrossFadingButton.qml 2014-02-19 00:05:24 +0000 |
372 | +++ src/app/qml/ui/CameraComponents/CrossFadingButton.qml 2014-05-09 18:12:38 +0000 |
373 | @@ -12,6 +12,20 @@ |
374 | * |
375 | * You should have received a copy of the GNU General Public License |
376 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
377 | + * |
378 | + * In addition, as a special exception, the copyright holders give |
379 | + * permission to link the code of portions of this program with the |
380 | + * OpenSSL library under certain conditions as described in each |
381 | + * individual source file, and distribute linked combinations |
382 | + * including the two. |
383 | + * |
384 | + * You must obey the GNU General Public License in all respects |
385 | + * for all of the code used other than OpenSSL. If you modify |
386 | + * file(s) with this exception, you may extend this exception to your |
387 | + * version of the file(s), but you are not obligated to do so. If you |
388 | + * do not wish to do so, delete this exception statement from your |
389 | + * version. If you delete this exception statement from all source |
390 | + * files in the program, then also delete it here. |
391 | */ |
392 | |
393 | import QtQuick 2.0 |
394 | |
395 | === modified file 'src/app/qml/ui/CameraComponents/FadingButton.qml' |
396 | --- src/app/qml/ui/CameraComponents/FadingButton.qml 2014-02-19 00:05:24 +0000 |
397 | +++ src/app/qml/ui/CameraComponents/FadingButton.qml 2014-05-09 18:12:38 +0000 |
398 | @@ -12,6 +12,20 @@ |
399 | * |
400 | * You should have received a copy of the GNU General Public License |
401 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
402 | + * |
403 | + * In addition, as a special exception, the copyright holders give |
404 | + * permission to link the code of portions of this program with the |
405 | + * OpenSSL library under certain conditions as described in each |
406 | + * individual source file, and distribute linked combinations |
407 | + * including the two. |
408 | + * |
409 | + * You must obey the GNU General Public License in all respects |
410 | + * for all of the code used other than OpenSSL. If you modify |
411 | + * file(s) with this exception, you may extend this exception to your |
412 | + * version of the file(s), but you are not obligated to do so. If you |
413 | + * do not wish to do so, delete this exception statement from your |
414 | + * version. If you delete this exception statement from all source |
415 | + * files in the program, then also delete it here. |
416 | */ |
417 | |
418 | import QtQuick 2.0 |
419 | |
420 | === modified file 'src/app/qml/ui/CameraComponents/FlashButton.qml' |
421 | --- src/app/qml/ui/CameraComponents/FlashButton.qml 2014-02-25 14:48:56 +0000 |
422 | +++ src/app/qml/ui/CameraComponents/FlashButton.qml 2014-05-09 18:12:38 +0000 |
423 | @@ -12,6 +12,20 @@ |
424 | * |
425 | * You should have received a copy of the GNU General Public License |
426 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
427 | + * |
428 | + * In addition, as a special exception, the copyright holders give |
429 | + * permission to link the code of portions of this program with the |
430 | + * OpenSSL library under certain conditions as described in each |
431 | + * individual source file, and distribute linked combinations |
432 | + * including the two. |
433 | + * |
434 | + * You must obey the GNU General Public License in all respects |
435 | + * for all of the code used other than OpenSSL. If you modify |
436 | + * file(s) with this exception, you may extend this exception to your |
437 | + * version of the file(s), but you are not obligated to do so. If you |
438 | + * do not wish to do so, delete this exception statement from your |
439 | + * version. If you delete this exception statement from all source |
440 | + * files in the program, then also delete it here. |
441 | */ |
442 | |
443 | import QtQuick 2.0 |
444 | |
445 | === modified file 'src/app/qml/ui/CameraComponents/ThinSliderStyle.qml' |
446 | --- src/app/qml/ui/CameraComponents/ThinSliderStyle.qml 2014-02-19 00:05:24 +0000 |
447 | +++ src/app/qml/ui/CameraComponents/ThinSliderStyle.qml 2014-05-09 18:12:38 +0000 |
448 | @@ -12,6 +12,20 @@ |
449 | * |
450 | * You should have received a copy of the GNU General Public License |
451 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
452 | + * |
453 | + * In addition, as a special exception, the copyright holders give |
454 | + * permission to link the code of portions of this program with the |
455 | + * OpenSSL library under certain conditions as described in each |
456 | + * individual source file, and distribute linked combinations |
457 | + * including the two. |
458 | + * |
459 | + * You must obey the GNU General Public License in all respects |
460 | + * for all of the code used other than OpenSSL. If you modify |
461 | + * file(s) with this exception, you may extend this exception to your |
462 | + * version of the file(s), but you are not obligated to do so. If you |
463 | + * do not wish to do so, delete this exception statement from your |
464 | + * version. If you delete this exception statement from all source |
465 | + * files in the program, then also delete it here. |
466 | */ |
467 | |
468 | import QtQuick 2.0 |
469 | |
470 | === modified file 'src/app/qml/ui/CameraComponents/ViewFinderGeometry.qml' |
471 | --- src/app/qml/ui/CameraComponents/ViewFinderGeometry.qml 2014-02-19 00:05:24 +0000 |
472 | +++ src/app/qml/ui/CameraComponents/ViewFinderGeometry.qml 2014-05-09 18:12:38 +0000 |
473 | @@ -12,6 +12,20 @@ |
474 | * |
475 | * You should have received a copy of the GNU General Public License |
476 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
477 | + * |
478 | + * In addition, as a special exception, the copyright holders give |
479 | + * permission to link the code of portions of this program with the |
480 | + * OpenSSL library under certain conditions as described in each |
481 | + * individual source file, and distribute linked combinations |
482 | + * including the two. |
483 | + * |
484 | + * You must obey the GNU General Public License in all respects |
485 | + * for all of the code used other than OpenSSL. If you modify |
486 | + * file(s) with this exception, you may extend this exception to your |
487 | + * version of the file(s), but you are not obligated to do so. If you |
488 | + * do not wish to do so, delete this exception statement from your |
489 | + * version. If you delete this exception statement from all source |
490 | + * files in the program, then also delete it here. |
491 | */ |
492 | |
493 | import QtQuick 2.0 |
494 | |
495 | === modified file 'src/app/qml/ui/CameraComponents/ZoomControl.qml' |
496 | --- src/app/qml/ui/CameraComponents/ZoomControl.qml 2014-02-25 15:07:24 +0000 |
497 | +++ src/app/qml/ui/CameraComponents/ZoomControl.qml 2014-05-09 18:12:38 +0000 |
498 | @@ -12,6 +12,20 @@ |
499 | * |
500 | * You should have received a copy of the GNU General Public License |
501 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
502 | + * |
503 | + * In addition, as a special exception, the copyright holders give |
504 | + * permission to link the code of portions of this program with the |
505 | + * OpenSSL library under certain conditions as described in each |
506 | + * individual source file, and distribute linked combinations |
507 | + * including the two. |
508 | + * |
509 | + * You must obey the GNU General Public License in all respects |
510 | + * for all of the code used other than OpenSSL. If you modify |
511 | + * file(s) with this exception, you may extend this exception to your |
512 | + * version of the file(s), but you are not obligated to do so. If you |
513 | + * do not wish to do so, delete this exception statement from your |
514 | + * version. If you delete this exception statement from all source |
515 | + * files in the program, then also delete it here. |
516 | */ |
517 | |
518 | import QtQuick 2.0 |
519 | |
520 | === modified file 'src/app/qml/ui/CameraComponents/constants.js' |
521 | --- src/app/qml/ui/CameraComponents/constants.js 2014-02-19 00:05:24 +0000 |
522 | +++ src/app/qml/ui/CameraComponents/constants.js 2014-05-09 18:12:38 +0000 |
523 | @@ -12,6 +12,20 @@ |
524 | * |
525 | * You should have received a copy of the GNU General Public License |
526 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
527 | + * |
528 | + * In addition, as a special exception, the copyright holders give |
529 | + * permission to link the code of portions of this program with the |
530 | + * OpenSSL library under certain conditions as described in each |
531 | + * individual source file, and distribute linked combinations |
532 | + * including the two. |
533 | + * |
534 | + * You must obey the GNU General Public License in all respects |
535 | + * for all of the code used other than OpenSSL. If you modify |
536 | + * file(s) with this exception, you may extend this exception to your |
537 | + * version of the file(s), but you are not obligated to do so. If you |
538 | + * do not wish to do so, delete this exception statement from your |
539 | + * version. If you delete this exception statement from all source |
540 | + * files in the program, then also delete it here. |
541 | */ |
542 | |
543 | .pragma library |
544 | |
545 | === modified file 'src/app/qml/ui/CameraConfirm.qml' |
546 | --- src/app/qml/ui/CameraConfirm.qml 2014-02-27 12:06:05 +0000 |
547 | +++ src/app/qml/ui/CameraConfirm.qml 2014-05-09 18:12:38 +0000 |
548 | @@ -14,6 +14,20 @@ |
549 | * |
550 | * You should have received a copy of the GNU General Public License |
551 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
552 | + * |
553 | + * In addition, as a special exception, the copyright holders give |
554 | + * permission to link the code of portions of this program with the |
555 | + * OpenSSL library under certain conditions as described in each |
556 | + * individual source file, and distribute linked combinations |
557 | + * including the two. |
558 | + * |
559 | + * You must obey the GNU General Public License in all respects |
560 | + * for all of the code used other than OpenSSL. If you modify |
561 | + * file(s) with this exception, you may extend this exception to your |
562 | + * version of the file(s), but you are not obligated to do so. If you |
563 | + * do not wish to do so, delete this exception statement from your |
564 | + * version. If you delete this exception statement from all source |
565 | + * files in the program, then also delete it here. |
566 | */ |
567 | |
568 | import QtQuick 2.0 |
569 | |
570 | === modified file 'src/app/qml/ui/CameraPage.qml' |
571 | --- src/app/qml/ui/CameraPage.qml 2014-02-25 15:07:24 +0000 |
572 | +++ src/app/qml/ui/CameraPage.qml 2014-05-09 18:12:38 +0000 |
573 | @@ -14,6 +14,20 @@ |
574 | * |
575 | * You should have received a copy of the GNU General Public License |
576 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
577 | + * |
578 | + * In addition, as a special exception, the copyright holders give |
579 | + * permission to link the code of portions of this program with the |
580 | + * OpenSSL library under certain conditions as described in each |
581 | + * individual source file, and distribute linked combinations |
582 | + * including the two. |
583 | + * |
584 | + * You must obey the GNU General Public License in all respects |
585 | + * for all of the code used other than OpenSSL. If you modify |
586 | + * file(s) with this exception, you may extend this exception to your |
587 | + * version of the file(s), but you are not obligated to do so. If you |
588 | + * do not wish to do so, delete this exception statement from your |
589 | + * version. If you delete this exception statement from all source |
590 | + * files in the program, then also delete it here. |
591 | */ |
592 | |
593 | import QtQuick 2.0 |
594 | |
595 | === modified file 'src/app/qml/ui/EditNotePage.qml' |
596 | --- src/app/qml/ui/EditNotePage.qml 2014-05-07 16:34:06 +0000 |
597 | +++ src/app/qml/ui/EditNotePage.qml 2014-05-09 18:12:38 +0000 |
598 | @@ -14,6 +14,20 @@ |
599 | * |
600 | * You should have received a copy of the GNU General Public License |
601 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
602 | + * |
603 | + * In addition, as a special exception, the copyright holders give |
604 | + * permission to link the code of portions of this program with the |
605 | + * OpenSSL library under certain conditions as described in each |
606 | + * individual source file, and distribute linked combinations |
607 | + * including the two. |
608 | + * |
609 | + * You must obey the GNU General Public License in all respects |
610 | + * for all of the code used other than OpenSSL. If you modify |
611 | + * file(s) with this exception, you may extend this exception to your |
612 | + * version of the file(s), but you are not obligated to do so. If you |
613 | + * do not wish to do so, delete this exception statement from your |
614 | + * version. If you delete this exception statement from all source |
615 | + * files in the program, then also delete it here. |
616 | */ |
617 | |
618 | import QtQuick 2.0 |
619 | |
620 | === modified file 'src/app/qml/ui/EditNoteView.qml' |
621 | --- src/app/qml/ui/EditNoteView.qml 2014-05-07 16:34:06 +0000 |
622 | +++ src/app/qml/ui/EditNoteView.qml 2014-05-09 18:12:38 +0000 |
623 | @@ -14,6 +14,20 @@ |
624 | * |
625 | * You should have received a copy of the GNU General Public License |
626 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
627 | + * |
628 | + * In addition, as a special exception, the copyright holders give |
629 | + * permission to link the code of portions of this program with the |
630 | + * OpenSSL library under certain conditions as described in each |
631 | + * individual source file, and distribute linked combinations |
632 | + * including the two. |
633 | + * |
634 | + * You must obey the GNU General Public License in all respects |
635 | + * for all of the code used other than OpenSSL. If you modify |
636 | + * file(s) with this exception, you may extend this exception to your |
637 | + * version of the file(s), but you are not obligated to do so. If you |
638 | + * do not wish to do so, delete this exception statement from your |
639 | + * version. If you delete this exception statement from all source |
640 | + * files in the program, then also delete it here. |
641 | */ |
642 | |
643 | import QtQuick 2.0 |
644 | |
645 | === modified file 'src/app/qml/ui/NotePage.qml' |
646 | --- src/app/qml/ui/NotePage.qml 2014-05-09 09:02:54 +0000 |
647 | +++ src/app/qml/ui/NotePage.qml 2014-05-09 18:12:38 +0000 |
648 | @@ -14,6 +14,20 @@ |
649 | * |
650 | * You should have received a copy of the GNU General Public License |
651 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
652 | + * |
653 | + * In addition, as a special exception, the copyright holders give |
654 | + * permission to link the code of portions of this program with the |
655 | + * OpenSSL library under certain conditions as described in each |
656 | + * individual source file, and distribute linked combinations |
657 | + * including the two. |
658 | + * |
659 | + * You must obey the GNU General Public License in all respects |
660 | + * for all of the code used other than OpenSSL. If you modify |
661 | + * file(s) with this exception, you may extend this exception to your |
662 | + * version of the file(s), but you are not obligated to do so. If you |
663 | + * do not wish to do so, delete this exception statement from your |
664 | + * version. If you delete this exception statement from all source |
665 | + * files in the program, then also delete it here. |
666 | */ |
667 | |
668 | import QtQuick 2.0 |
669 | |
670 | === modified file 'src/app/qml/ui/NoteView.qml' |
671 | --- src/app/qml/ui/NoteView.qml 2014-05-09 14:57:31 +0000 |
672 | +++ src/app/qml/ui/NoteView.qml 2014-05-09 18:12:38 +0000 |
673 | @@ -14,6 +14,20 @@ |
674 | * |
675 | * You should have received a copy of the GNU General Public License |
676 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
677 | + * |
678 | + * In addition, as a special exception, the copyright holders give |
679 | + * permission to link the code of portions of this program with the |
680 | + * OpenSSL library under certain conditions as described in each |
681 | + * individual source file, and distribute linked combinations |
682 | + * including the two. |
683 | + * |
684 | + * You must obey the GNU General Public License in all respects |
685 | + * for all of the code used other than OpenSSL. If you modify |
686 | + * file(s) with this exception, you may extend this exception to your |
687 | + * version of the file(s), but you are not obligated to do so. If you |
688 | + * do not wish to do so, delete this exception statement from your |
689 | + * version. If you delete this exception statement from all source |
690 | + * files in the program, then also delete it here. |
691 | */ |
692 | |
693 | import QtQuick 2.0 |
694 | |
695 | === modified file 'src/app/qml/ui/NotebooksPage.qml' |
696 | --- src/app/qml/ui/NotebooksPage.qml 2014-05-05 23:07:07 +0000 |
697 | +++ src/app/qml/ui/NotebooksPage.qml 2014-05-09 18:12:38 +0000 |
698 | @@ -14,6 +14,20 @@ |
699 | * |
700 | * You should have received a copy of the GNU General Public License |
701 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
702 | + * |
703 | + * In addition, as a special exception, the copyright holders give |
704 | + * permission to link the code of portions of this program with the |
705 | + * OpenSSL library under certain conditions as described in each |
706 | + * individual source file, and distribute linked combinations |
707 | + * including the two. |
708 | + * |
709 | + * You must obey the GNU General Public License in all respects |
710 | + * for all of the code used other than OpenSSL. If you modify |
711 | + * file(s) with this exception, you may extend this exception to your |
712 | + * version of the file(s), but you are not obligated to do so. If you |
713 | + * do not wish to do so, delete this exception statement from your |
714 | + * version. If you delete this exception statement from all source |
715 | + * files in the program, then also delete it here. |
716 | */ |
717 | |
718 | import QtQuick 2.0 |
719 | |
720 | === modified file 'src/app/qml/ui/NotesPage.qml' |
721 | --- src/app/qml/ui/NotesPage.qml 2014-05-09 09:05:32 +0000 |
722 | +++ src/app/qml/ui/NotesPage.qml 2014-05-09 18:12:38 +0000 |
723 | @@ -14,6 +14,20 @@ |
724 | * |
725 | * You should have received a copy of the GNU General Public License |
726 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
727 | + * |
728 | + * In addition, as a special exception, the copyright holders give |
729 | + * permission to link the code of portions of this program with the |
730 | + * OpenSSL library under certain conditions as described in each |
731 | + * individual source file, and distribute linked combinations |
732 | + * including the two. |
733 | + * |
734 | + * You must obey the GNU General Public License in all respects |
735 | + * for all of the code used other than OpenSSL. If you modify |
736 | + * file(s) with this exception, you may extend this exception to your |
737 | + * version of the file(s), but you are not obligated to do so. If you |
738 | + * do not wish to do so, delete this exception statement from your |
739 | + * version. If you delete this exception statement from all source |
740 | + * files in the program, then also delete it here. |
741 | */ |
742 | |
743 | import QtQuick 2.0 |
744 | |
745 | === modified file 'src/app/qml/ui/RemindersPage.qml' |
746 | --- src/app/qml/ui/RemindersPage.qml 2014-05-08 16:30:57 +0000 |
747 | +++ src/app/qml/ui/RemindersPage.qml 2014-05-09 18:12:38 +0000 |
748 | @@ -14,6 +14,20 @@ |
749 | * |
750 | * You should have received a copy of the GNU General Public License |
751 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
752 | + * |
753 | + * In addition, as a special exception, the copyright holders give |
754 | + * permission to link the code of portions of this program with the |
755 | + * OpenSSL library under certain conditions as described in each |
756 | + * individual source file, and distribute linked combinations |
757 | + * including the two. |
758 | + * |
759 | + * You must obey the GNU General Public License in all respects |
760 | + * for all of the code used other than OpenSSL. If you modify |
761 | + * file(s) with this exception, you may extend this exception to your |
762 | + * version of the file(s), but you are not obligated to do so. If you |
763 | + * do not wish to do so, delete this exception statement from your |
764 | + * version. If you delete this exception statement from all source |
765 | + * files in the program, then also delete it here. |
766 | */ |
767 | |
768 | import QtQuick 2.0 |
769 | |
770 | === modified file 'src/app/qml/ui/SearchNotesPage.qml' |
771 | --- src/app/qml/ui/SearchNotesPage.qml 2014-02-18 09:36:38 +0000 |
772 | +++ src/app/qml/ui/SearchNotesPage.qml 2014-05-09 18:12:38 +0000 |
773 | @@ -14,6 +14,20 @@ |
774 | * |
775 | * You should have received a copy of the GNU General Public License |
776 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
777 | + * |
778 | + * In addition, as a special exception, the copyright holders give |
779 | + * permission to link the code of portions of this program with the |
780 | + * OpenSSL library under certain conditions as described in each |
781 | + * individual source file, and distribute linked combinations |
782 | + * including the two. |
783 | + * |
784 | + * You must obey the GNU General Public License in all respects |
785 | + * for all of the code used other than OpenSSL. If you modify |
786 | + * file(s) with this exception, you may extend this exception to your |
787 | + * version of the file(s), but you are not obligated to do so. If you |
788 | + * do not wish to do so, delete this exception statement from your |
789 | + * version. If you delete this exception statement from all source |
790 | + * files in the program, then also delete it here. |
791 | */ |
792 | |
793 | import QtQuick 2.0 |
794 | |
795 | === modified file 'src/app/qml/ui/SetReminderPage.qml' |
796 | --- src/app/qml/ui/SetReminderPage.qml 2014-05-08 16:33:21 +0000 |
797 | +++ src/app/qml/ui/SetReminderPage.qml 2014-05-09 18:12:38 +0000 |
798 | @@ -14,6 +14,20 @@ |
799 | * |
800 | * You should have received a copy of the GNU General Public License |
801 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
802 | + * |
803 | + * In addition, as a special exception, the copyright holders give |
804 | + * permission to link the code of portions of this program with the |
805 | + * OpenSSL library under certain conditions as described in each |
806 | + * individual source file, and distribute linked combinations |
807 | + * including the two. |
808 | + * |
809 | + * You must obey the GNU General Public License in all respects |
810 | + * for all of the code used other than OpenSSL. If you modify |
811 | + * file(s) with this exception, you may extend this exception to your |
812 | + * version of the file(s), but you are not obligated to do so. If you |
813 | + * do not wish to do so, delete this exception statement from your |
814 | + * version. If you delete this exception statement from all source |
815 | + * files in the program, then also delete it here. |
816 | */ |
817 | |
818 | import QtQuick 2.0 |
819 | |
820 | === modified file 'src/app/qml/ui/SetReminderView.qml' |
821 | --- src/app/qml/ui/SetReminderView.qml 2014-05-07 19:11:05 +0000 |
822 | +++ src/app/qml/ui/SetReminderView.qml 2014-05-09 18:12:38 +0000 |
823 | @@ -14,6 +14,20 @@ |
824 | * |
825 | * You should have received a copy of the GNU General Public License |
826 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
827 | + * |
828 | + * In addition, as a special exception, the copyright holders give |
829 | + * permission to link the code of portions of this program with the |
830 | + * OpenSSL library under certain conditions as described in each |
831 | + * individual source file, and distribute linked combinations |
832 | + * including the two. |
833 | + * |
834 | + * You must obey the GNU General Public License in all respects |
835 | + * for all of the code used other than OpenSSL. If you modify |
836 | + * file(s) with this exception, you may extend this exception to your |
837 | + * version of the file(s), but you are not obligated to do so. If you |
838 | + * do not wish to do so, delete this exception statement from your |
839 | + * version. If you delete this exception statement from all source |
840 | + * files in the program, then also delete it here. |
841 | */ |
842 | |
843 | import QtQuick 2.0 |
844 | |
845 | === modified file 'src/app/qml/ui/reminders-scripts.js' |
846 | --- src/app/qml/ui/reminders-scripts.js 2013-12-17 23:19:58 +0000 |
847 | +++ src/app/qml/ui/reminders-scripts.js 2014-05-09 18:12:38 +0000 |
848 | @@ -1,3 +1,35 @@ |
849 | +/* |
850 | + * Copyright: 2013 Canonical, Ltd |
851 | + * |
852 | + * This file is part of reminders |
853 | + * |
854 | + * reminders is free software: you can redistribute it and/or modify |
855 | + * it under the terms of the GNU General Public License as published by |
856 | + * the Free Software Foundation; version 3. |
857 | + * |
858 | + * reminders is distributed in the hope that it will be useful, |
859 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
860 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
861 | + * GNU General Public License for more details. |
862 | + * |
863 | + * You should have received a copy of the GNU General Public License |
864 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
865 | + * |
866 | + * In addition, as a special exception, the copyright holders give |
867 | + * permission to link the code of portions of this program with the |
868 | + * OpenSSL library under certain conditions as described in each |
869 | + * individual source file, and distribute linked combinations |
870 | + * including the two. |
871 | + * |
872 | + * You must obey the GNU General Public License in all respects |
873 | + * for all of the code used other than OpenSSL. If you modify |
874 | + * file(s) with this exception, you may extend this exception to your |
875 | + * version of the file(s), but you are not obligated to do so. If you |
876 | + * do not wish to do so, delete this exception statement from your |
877 | + * version. If you delete this exception statement from all source |
878 | + * files in the program, then also delete it here. |
879 | + */ |
880 | + |
881 | function handleClickEvent(event) { |
882 | var todoTag = "en-todo"; |
883 | if (event.srcElement.id.slice(0, todoTag.length) === todoTag) { |
884 | |
885 | === modified file 'src/plugin/Evernote/evernoteconnection.cpp' |
886 | --- src/plugin/Evernote/evernoteconnection.cpp 2014-04-30 20:11:18 +0000 |
887 | +++ src/plugin/Evernote/evernoteconnection.cpp 2014-05-09 18:12:38 +0000 |
888 | @@ -15,6 +15,20 @@ |
889 | * You should have received a copy of the GNU General Public License |
890 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
891 | * |
892 | + * In addition, as a special exception, the copyright holders give |
893 | + * permission to link the code of portions of this program with the |
894 | + * OpenSSL library under certain conditions as described in each |
895 | + * individual source file, and distribute linked combinations |
896 | + * including the two. |
897 | + * |
898 | + * You must obey the GNU General Public License in all respects |
899 | + * for all of the code used other than OpenSSL. If you modify |
900 | + * file(s) with this exception, you may extend this exception to your |
901 | + * version of the file(s), but you are not obligated to do so. If you |
902 | + * do not wish to do so, delete this exception statement from your |
903 | + * version. If you delete this exception statement from all source |
904 | + * files in the program, then also delete it here. |
905 | + * |
906 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
907 | * Riccardo Padovani <rpadovani@ubuntu.com> |
908 | */ |
909 | |
910 | === modified file 'src/plugin/Evernote/evernoteconnection.h' |
911 | --- src/plugin/Evernote/evernoteconnection.h 2014-04-30 20:03:48 +0000 |
912 | +++ src/plugin/Evernote/evernoteconnection.h 2014-05-09 18:12:38 +0000 |
913 | @@ -15,6 +15,20 @@ |
914 | * You should have received a copy of the GNU General Public License |
915 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
916 | * |
917 | + * In addition, as a special exception, the copyright holders give |
918 | + * permission to link the code of portions of this program with the |
919 | + * OpenSSL library under certain conditions as described in each |
920 | + * individual source file, and distribute linked combinations |
921 | + * including the two. |
922 | + * |
923 | + * You must obey the GNU General Public License in all respects |
924 | + * for all of the code used other than OpenSSL. If you modify |
925 | + * file(s) with this exception, you may extend this exception to your |
926 | + * version of the file(s), but you are not obligated to do so. If you |
927 | + * do not wish to do so, delete this exception statement from your |
928 | + * version. If you delete this exception statement from all source |
929 | + * files in the program, then also delete it here. |
930 | + * |
931 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
932 | * Riccardo Padovani <rpadovani@ubuntu.com> |
933 | */ |
934 | |
935 | === modified file 'src/plugin/Evernote/evernoteplugin.cpp' |
936 | --- src/plugin/Evernote/evernoteplugin.cpp 2014-02-18 14:04:33 +0000 |
937 | +++ src/plugin/Evernote/evernoteplugin.cpp 2014-05-09 18:12:38 +0000 |
938 | @@ -15,6 +15,20 @@ |
939 | * You should have received a copy of the GNU General Public License |
940 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
941 | * |
942 | + * In addition, as a special exception, the copyright holders give |
943 | + * permission to link the code of portions of this program with the |
944 | + * OpenSSL library under certain conditions as described in each |
945 | + * individual source file, and distribute linked combinations |
946 | + * including the two. |
947 | + * |
948 | + * You must obey the GNU General Public License in all respects |
949 | + * for all of the code used other than OpenSSL. If you modify |
950 | + * file(s) with this exception, you may extend this exception to your |
951 | + * version of the file(s), but you are not obligated to do so. If you |
952 | + * do not wish to do so, delete this exception statement from your |
953 | + * version. If you delete this exception statement from all source |
954 | + * files in the program, then also delete it here. |
955 | + * |
956 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
957 | */ |
958 | |
959 | |
960 | === modified file 'src/plugin/Evernote/evernoteplugin.h' |
961 | --- src/plugin/Evernote/evernoteplugin.h 2013-12-14 22:38:57 +0000 |
962 | +++ src/plugin/Evernote/evernoteplugin.h 2014-05-09 18:12:38 +0000 |
963 | @@ -1,25 +1,39 @@ |
964 | -/***************************************************************************** |
965 | - * Copyright: 2013 Michael Zanetti <michael_zanetti@gmx.net> * |
966 | - * * |
967 | - * This file is part of ubuntu-fitbit-app * |
968 | - * * |
969 | - * ubuntu-fitbit-app is free software: you can redistribute it and/or modify * |
970 | - * it under the terms of the GNU General Public License as published by * |
971 | - * the Free Software Foundation, either version 3 of the License, or * |
972 | - * (at your option) any later version. * |
973 | - * * |
974 | - * ubuntu-fitbit-app is distributed in the hope that it will be useful, * |
975 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of * |
976 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * |
977 | - * GNU General Public License for more details. * |
978 | - * * |
979 | - * You should have received a copy of the GNU General Public License * |
980 | - * along with this program. If not, see <http://www.gnu.org/licenses/>. * |
981 | - * * |
982 | - ****************************************************************************/ |
983 | +/* |
984 | + * Copyright: 2013 Canonical, Ltd |
985 | + * |
986 | + * This file is part of reminders |
987 | + * |
988 | + * reminders is free software: you can redistribute it and/or modify |
989 | + * it under the terms of the GNU General Public License as published by |
990 | + * the Free Software Foundation; version 3. |
991 | + * |
992 | + * reminders is distributed in the hope that it will be useful, |
993 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
994 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
995 | + * GNU General Public License for more details. |
996 | + * |
997 | + * You should have received a copy of the GNU General Public License |
998 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
999 | + * |
1000 | + * In addition, as a special exception, the copyright holders give |
1001 | + * permission to link the code of portions of this program with the |
1002 | + * OpenSSL library under certain conditions as described in each |
1003 | + * individual source file, and distribute linked combinations |
1004 | + * including the two. |
1005 | + * |
1006 | + * You must obey the GNU General Public License in all respects |
1007 | + * for all of the code used other than OpenSSL. If you modify |
1008 | + * file(s) with this exception, you may extend this exception to your |
1009 | + * version of the file(s), but you are not obligated to do so. If you |
1010 | + * do not wish to do so, delete this exception statement from your |
1011 | + * version. If you delete this exception statement from all source |
1012 | + * files in the program, then also delete it here. |
1013 | + * |
1014 | + * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1015 | + */ |
1016 | |
1017 | -#ifndef FITBITPLUGIN_H |
1018 | -#define FITBITPLUGIN_H |
1019 | +#ifndef EVERNOTEPLUGIN_H |
1020 | +#define EVERNOTEPLUGIN_H |
1021 | |
1022 | #include <QQmlExtensionPlugin> |
1023 | |
1024 | @@ -32,4 +46,4 @@ |
1025 | void initializeEngine(QQmlEngine *engine, const char *uri); |
1026 | }; |
1027 | |
1028 | -#endif // FITBITPLUGIN_H |
1029 | +#endif // EVERNOTEPLUGIN_H |
1030 | |
1031 | === modified file 'src/plugin/Evernote/jobs/createnotebookjob.cpp' |
1032 | --- src/plugin/Evernote/jobs/createnotebookjob.cpp 2014-01-27 13:00:41 +0000 |
1033 | +++ src/plugin/Evernote/jobs/createnotebookjob.cpp 2014-05-09 18:12:38 +0000 |
1034 | @@ -15,6 +15,20 @@ |
1035 | * You should have received a copy of the GNU General Public License |
1036 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1037 | * |
1038 | + * In addition, as a special exception, the copyright holders give |
1039 | + * permission to link the code of portions of this program with the |
1040 | + * OpenSSL library under certain conditions as described in each |
1041 | + * individual source file, and distribute linked combinations |
1042 | + * including the two. |
1043 | + * |
1044 | + * You must obey the GNU General Public License in all respects |
1045 | + * for all of the code used other than OpenSSL. If you modify |
1046 | + * file(s) with this exception, you may extend this exception to your |
1047 | + * version of the file(s), but you are not obligated to do so. If you |
1048 | + * do not wish to do so, delete this exception statement from your |
1049 | + * version. If you delete this exception statement from all source |
1050 | + * files in the program, then also delete it here. |
1051 | + * |
1052 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1053 | */ |
1054 | |
1055 | |
1056 | === modified file 'src/plugin/Evernote/jobs/createnotebookjob.h' |
1057 | --- src/plugin/Evernote/jobs/createnotebookjob.h 2014-01-27 13:00:41 +0000 |
1058 | +++ src/plugin/Evernote/jobs/createnotebookjob.h 2014-05-09 18:12:38 +0000 |
1059 | @@ -15,6 +15,20 @@ |
1060 | * You should have received a copy of the GNU General Public License |
1061 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1062 | * |
1063 | + * In addition, as a special exception, the copyright holders give |
1064 | + * permission to link the code of portions of this program with the |
1065 | + * OpenSSL library under certain conditions as described in each |
1066 | + * individual source file, and distribute linked combinations |
1067 | + * including the two. |
1068 | + * |
1069 | + * You must obey the GNU General Public License in all respects |
1070 | + * for all of the code used other than OpenSSL. If you modify |
1071 | + * file(s) with this exception, you may extend this exception to your |
1072 | + * version of the file(s), but you are not obligated to do so. If you |
1073 | + * do not wish to do so, delete this exception statement from your |
1074 | + * version. If you delete this exception statement from all source |
1075 | + * files in the program, then also delete it here. |
1076 | + * |
1077 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1078 | */ |
1079 | |
1080 | |
1081 | === modified file 'src/plugin/Evernote/jobs/createnotejob.cpp' |
1082 | --- src/plugin/Evernote/jobs/createnotejob.cpp 2014-01-27 13:00:41 +0000 |
1083 | +++ src/plugin/Evernote/jobs/createnotejob.cpp 2014-05-09 18:12:38 +0000 |
1084 | @@ -15,6 +15,20 @@ |
1085 | * You should have received a copy of the GNU General Public License |
1086 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1087 | * |
1088 | + * In addition, as a special exception, the copyright holders give |
1089 | + * permission to link the code of portions of this program with the |
1090 | + * OpenSSL library under certain conditions as described in each |
1091 | + * individual source file, and distribute linked combinations |
1092 | + * including the two. |
1093 | + * |
1094 | + * You must obey the GNU General Public License in all respects |
1095 | + * for all of the code used other than OpenSSL. If you modify |
1096 | + * file(s) with this exception, you may extend this exception to your |
1097 | + * version of the file(s), but you are not obligated to do so. If you |
1098 | + * do not wish to do so, delete this exception statement from your |
1099 | + * version. If you delete this exception statement from all source |
1100 | + * files in the program, then also delete it here. |
1101 | + * |
1102 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1103 | */ |
1104 | |
1105 | |
1106 | === modified file 'src/plugin/Evernote/jobs/createnotejob.h' |
1107 | --- src/plugin/Evernote/jobs/createnotejob.h 2014-01-27 13:00:41 +0000 |
1108 | +++ src/plugin/Evernote/jobs/createnotejob.h 2014-05-09 18:12:38 +0000 |
1109 | @@ -15,6 +15,20 @@ |
1110 | * You should have received a copy of the GNU General Public License |
1111 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1112 | * |
1113 | + * In addition, as a special exception, the copyright holders give |
1114 | + * permission to link the code of portions of this program with the |
1115 | + * OpenSSL library under certain conditions as described in each |
1116 | + * individual source file, and distribute linked combinations |
1117 | + * including the two. |
1118 | + * |
1119 | + * You must obey the GNU General Public License in all respects |
1120 | + * for all of the code used other than OpenSSL. If you modify |
1121 | + * file(s) with this exception, you may extend this exception to your |
1122 | + * version of the file(s), but you are not obligated to do so. If you |
1123 | + * do not wish to do so, delete this exception statement from your |
1124 | + * version. If you delete this exception statement from all source |
1125 | + * files in the program, then also delete it here. |
1126 | + * |
1127 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1128 | */ |
1129 | |
1130 | |
1131 | === modified file 'src/plugin/Evernote/jobs/deletenotejob.cpp' |
1132 | --- src/plugin/Evernote/jobs/deletenotejob.cpp 2014-01-27 13:00:41 +0000 |
1133 | +++ src/plugin/Evernote/jobs/deletenotejob.cpp 2014-05-09 18:12:38 +0000 |
1134 | @@ -15,6 +15,20 @@ |
1135 | * You should have received a copy of the GNU General Public License |
1136 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1137 | * |
1138 | + * In addition, as a special exception, the copyright holders give |
1139 | + * permission to link the code of portions of this program with the |
1140 | + * OpenSSL library under certain conditions as described in each |
1141 | + * individual source file, and distribute linked combinations |
1142 | + * including the two. |
1143 | + * |
1144 | + * You must obey the GNU General Public License in all respects |
1145 | + * for all of the code used other than OpenSSL. If you modify |
1146 | + * file(s) with this exception, you may extend this exception to your |
1147 | + * version of the file(s), but you are not obligated to do so. If you |
1148 | + * do not wish to do so, delete this exception statement from your |
1149 | + * version. If you delete this exception statement from all source |
1150 | + * files in the program, then also delete it here. |
1151 | + * |
1152 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1153 | */ |
1154 | |
1155 | |
1156 | === modified file 'src/plugin/Evernote/jobs/deletenotejob.h' |
1157 | --- src/plugin/Evernote/jobs/deletenotejob.h 2014-01-27 13:00:41 +0000 |
1158 | +++ src/plugin/Evernote/jobs/deletenotejob.h 2014-05-09 18:12:38 +0000 |
1159 | @@ -15,6 +15,20 @@ |
1160 | * You should have received a copy of the GNU General Public License |
1161 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1162 | * |
1163 | + * In addition, as a special exception, the copyright holders give |
1164 | + * permission to link the code of portions of this program with the |
1165 | + * OpenSSL library under certain conditions as described in each |
1166 | + * individual source file, and distribute linked combinations |
1167 | + * including the two. |
1168 | + * |
1169 | + * You must obey the GNU General Public License in all respects |
1170 | + * for all of the code used other than OpenSSL. If you modify |
1171 | + * file(s) with this exception, you may extend this exception to your |
1172 | + * version of the file(s), but you are not obligated to do so. If you |
1173 | + * do not wish to do so, delete this exception statement from your |
1174 | + * version. If you delete this exception statement from all source |
1175 | + * files in the program, then also delete it here. |
1176 | + * |
1177 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1178 | */ |
1179 | |
1180 | |
1181 | === modified file 'src/plugin/Evernote/jobs/evernotejob.cpp' |
1182 | --- src/plugin/Evernote/jobs/evernotejob.cpp 2014-01-27 13:00:41 +0000 |
1183 | +++ src/plugin/Evernote/jobs/evernotejob.cpp 2014-05-09 18:12:38 +0000 |
1184 | @@ -15,6 +15,20 @@ |
1185 | * You should have received a copy of the GNU General Public License |
1186 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1187 | * |
1188 | + * In addition, as a special exception, the copyright holders give |
1189 | + * permission to link the code of portions of this program with the |
1190 | + * OpenSSL library under certain conditions as described in each |
1191 | + * individual source file, and distribute linked combinations |
1192 | + * including the two. |
1193 | + * |
1194 | + * You must obey the GNU General Public License in all respects |
1195 | + * for all of the code used other than OpenSSL. If you modify |
1196 | + * file(s) with this exception, you may extend this exception to your |
1197 | + * version of the file(s), but you are not obligated to do so. If you |
1198 | + * do not wish to do so, delete this exception statement from your |
1199 | + * version. If you delete this exception statement from all source |
1200 | + * files in the program, then also delete it here. |
1201 | + * |
1202 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1203 | */ |
1204 | |
1205 | |
1206 | === modified file 'src/plugin/Evernote/jobs/evernotejob.h' |
1207 | --- src/plugin/Evernote/jobs/evernotejob.h 2014-01-27 13:00:41 +0000 |
1208 | +++ src/plugin/Evernote/jobs/evernotejob.h 2014-05-09 18:12:38 +0000 |
1209 | @@ -15,6 +15,20 @@ |
1210 | * You should have received a copy of the GNU General Public License |
1211 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1212 | * |
1213 | + * In addition, as a special exception, the copyright holders give |
1214 | + * permission to link the code of portions of this program with the |
1215 | + * OpenSSL library under certain conditions as described in each |
1216 | + * individual source file, and distribute linked combinations |
1217 | + * including the two. |
1218 | + * |
1219 | + * You must obey the GNU General Public License in all respects |
1220 | + * for all of the code used other than OpenSSL. If you modify |
1221 | + * file(s) with this exception, you may extend this exception to your |
1222 | + * version of the file(s), but you are not obligated to do so. If you |
1223 | + * do not wish to do so, delete this exception statement from your |
1224 | + * version. If you delete this exception statement from all source |
1225 | + * files in the program, then also delete it here. |
1226 | + * |
1227 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1228 | */ |
1229 | |
1230 | |
1231 | === modified file 'src/plugin/Evernote/jobs/expungenotebookjob.cpp' |
1232 | --- src/plugin/Evernote/jobs/expungenotebookjob.cpp 2014-01-27 13:00:41 +0000 |
1233 | +++ src/plugin/Evernote/jobs/expungenotebookjob.cpp 2014-05-09 18:12:38 +0000 |
1234 | @@ -15,6 +15,20 @@ |
1235 | * You should have received a copy of the GNU General Public License |
1236 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1237 | * |
1238 | + * In addition, as a special exception, the copyright holders give |
1239 | + * permission to link the code of portions of this program with the |
1240 | + * OpenSSL library under certain conditions as described in each |
1241 | + * individual source file, and distribute linked combinations |
1242 | + * including the two. |
1243 | + * |
1244 | + * You must obey the GNU General Public License in all respects |
1245 | + * for all of the code used other than OpenSSL. If you modify |
1246 | + * file(s) with this exception, you may extend this exception to your |
1247 | + * version of the file(s), but you are not obligated to do so. If you |
1248 | + * do not wish to do so, delete this exception statement from your |
1249 | + * version. If you delete this exception statement from all source |
1250 | + * files in the program, then also delete it here. |
1251 | + * |
1252 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1253 | */ |
1254 | |
1255 | |
1256 | === modified file 'src/plugin/Evernote/jobs/expungenotebookjob.h' |
1257 | --- src/plugin/Evernote/jobs/expungenotebookjob.h 2014-01-27 13:00:41 +0000 |
1258 | +++ src/plugin/Evernote/jobs/expungenotebookjob.h 2014-05-09 18:12:38 +0000 |
1259 | @@ -15,6 +15,20 @@ |
1260 | * You should have received a copy of the GNU General Public License |
1261 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1262 | * |
1263 | + * In addition, as a special exception, the copyright holders give |
1264 | + * permission to link the code of portions of this program with the |
1265 | + * OpenSSL library under certain conditions as described in each |
1266 | + * individual source file, and distribute linked combinations |
1267 | + * including the two. |
1268 | + * |
1269 | + * You must obey the GNU General Public License in all respects |
1270 | + * for all of the code used other than OpenSSL. If you modify |
1271 | + * file(s) with this exception, you may extend this exception to your |
1272 | + * version of the file(s), but you are not obligated to do so. If you |
1273 | + * do not wish to do so, delete this exception statement from your |
1274 | + * version. If you delete this exception statement from all source |
1275 | + * files in the program, then also delete it here. |
1276 | + * |
1277 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1278 | */ |
1279 | |
1280 | |
1281 | === modified file 'src/plugin/Evernote/jobs/fetchnotebooksjob.cpp' |
1282 | --- src/plugin/Evernote/jobs/fetchnotebooksjob.cpp 2014-01-27 13:00:41 +0000 |
1283 | +++ src/plugin/Evernote/jobs/fetchnotebooksjob.cpp 2014-05-09 18:12:38 +0000 |
1284 | @@ -15,6 +15,20 @@ |
1285 | * You should have received a copy of the GNU General Public License |
1286 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1287 | * |
1288 | + * In addition, as a special exception, the copyright holders give |
1289 | + * permission to link the code of portions of this program with the |
1290 | + * OpenSSL library under certain conditions as described in each |
1291 | + * individual source file, and distribute linked combinations |
1292 | + * including the two. |
1293 | + * |
1294 | + * You must obey the GNU General Public License in all respects |
1295 | + * for all of the code used other than OpenSSL. If you modify |
1296 | + * file(s) with this exception, you may extend this exception to your |
1297 | + * version of the file(s), but you are not obligated to do so. If you |
1298 | + * do not wish to do so, delete this exception statement from your |
1299 | + * version. If you delete this exception statement from all source |
1300 | + * files in the program, then also delete it here. |
1301 | + * |
1302 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1303 | */ |
1304 | |
1305 | |
1306 | === modified file 'src/plugin/Evernote/jobs/fetchnotebooksjob.h' |
1307 | --- src/plugin/Evernote/jobs/fetchnotebooksjob.h 2014-01-27 13:00:41 +0000 |
1308 | +++ src/plugin/Evernote/jobs/fetchnotebooksjob.h 2014-05-09 18:12:38 +0000 |
1309 | @@ -15,6 +15,20 @@ |
1310 | * You should have received a copy of the GNU General Public License |
1311 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1312 | * |
1313 | + * In addition, as a special exception, the copyright holders give |
1314 | + * permission to link the code of portions of this program with the |
1315 | + * OpenSSL library under certain conditions as described in each |
1316 | + * individual source file, and distribute linked combinations |
1317 | + * including the two. |
1318 | + * |
1319 | + * You must obey the GNU General Public License in all respects |
1320 | + * for all of the code used other than OpenSSL. If you modify |
1321 | + * file(s) with this exception, you may extend this exception to your |
1322 | + * version of the file(s), but you are not obligated to do so. If you |
1323 | + * do not wish to do so, delete this exception statement from your |
1324 | + * version. If you delete this exception statement from all source |
1325 | + * files in the program, then also delete it here. |
1326 | + * |
1327 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1328 | */ |
1329 | |
1330 | |
1331 | === modified file 'src/plugin/Evernote/jobs/fetchnotejob.cpp' |
1332 | --- src/plugin/Evernote/jobs/fetchnotejob.cpp 2014-05-06 19:30:14 +0000 |
1333 | +++ src/plugin/Evernote/jobs/fetchnotejob.cpp 2014-05-09 18:12:38 +0000 |
1334 | @@ -15,6 +15,20 @@ |
1335 | * You should have received a copy of the GNU General Public License |
1336 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1337 | * |
1338 | + * In addition, as a special exception, the copyright holders give |
1339 | + * permission to link the code of portions of this program with the |
1340 | + * OpenSSL library under certain conditions as described in each |
1341 | + * individual source file, and distribute linked combinations |
1342 | + * including the two. |
1343 | + * |
1344 | + * You must obey the GNU General Public License in all respects |
1345 | + * for all of the code used other than OpenSSL. If you modify |
1346 | + * file(s) with this exception, you may extend this exception to your |
1347 | + * version of the file(s), but you are not obligated to do so. If you |
1348 | + * do not wish to do so, delete this exception statement from your |
1349 | + * version. If you delete this exception statement from all source |
1350 | + * files in the program, then also delete it here. |
1351 | + * |
1352 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1353 | */ |
1354 | |
1355 | |
1356 | === modified file 'src/plugin/Evernote/jobs/fetchnotejob.h' |
1357 | --- src/plugin/Evernote/jobs/fetchnotejob.h 2014-05-06 19:30:14 +0000 |
1358 | +++ src/plugin/Evernote/jobs/fetchnotejob.h 2014-05-09 18:12:38 +0000 |
1359 | @@ -15,6 +15,20 @@ |
1360 | * You should have received a copy of the GNU General Public License |
1361 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1362 | * |
1363 | + * In addition, as a special exception, the copyright holders give |
1364 | + * permission to link the code of portions of this program with the |
1365 | + * OpenSSL library under certain conditions as described in each |
1366 | + * individual source file, and distribute linked combinations |
1367 | + * including the two. |
1368 | + * |
1369 | + * You must obey the GNU General Public License in all respects |
1370 | + * for all of the code used other than OpenSSL. If you modify |
1371 | + * file(s) with this exception, you may extend this exception to your |
1372 | + * version of the file(s), but you are not obligated to do so. If you |
1373 | + * do not wish to do so, delete this exception statement from your |
1374 | + * version. If you delete this exception statement from all source |
1375 | + * files in the program, then also delete it here. |
1376 | + * |
1377 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1378 | */ |
1379 | |
1380 | |
1381 | === modified file 'src/plugin/Evernote/jobs/fetchnotesjob.cpp' |
1382 | --- src/plugin/Evernote/jobs/fetchnotesjob.cpp 2014-01-27 13:00:41 +0000 |
1383 | +++ src/plugin/Evernote/jobs/fetchnotesjob.cpp 2014-05-09 18:12:38 +0000 |
1384 | @@ -15,6 +15,20 @@ |
1385 | * You should have received a copy of the GNU General Public License |
1386 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1387 | * |
1388 | + * In addition, as a special exception, the copyright holders give |
1389 | + * permission to link the code of portions of this program with the |
1390 | + * OpenSSL library under certain conditions as described in each |
1391 | + * individual source file, and distribute linked combinations |
1392 | + * including the two. |
1393 | + * |
1394 | + * You must obey the GNU General Public License in all respects |
1395 | + * for all of the code used other than OpenSSL. If you modify |
1396 | + * file(s) with this exception, you may extend this exception to your |
1397 | + * version of the file(s), but you are not obligated to do so. If you |
1398 | + * do not wish to do so, delete this exception statement from your |
1399 | + * version. If you delete this exception statement from all source |
1400 | + * files in the program, then also delete it here. |
1401 | + * |
1402 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1403 | */ |
1404 | |
1405 | |
1406 | === modified file 'src/plugin/Evernote/jobs/fetchnotesjob.h' |
1407 | --- src/plugin/Evernote/jobs/fetchnotesjob.h 2014-01-27 13:00:41 +0000 |
1408 | +++ src/plugin/Evernote/jobs/fetchnotesjob.h 2014-05-09 18:12:38 +0000 |
1409 | @@ -15,6 +15,20 @@ |
1410 | * You should have received a copy of the GNU General Public License |
1411 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1412 | * |
1413 | + * In addition, as a special exception, the copyright holders give |
1414 | + * permission to link the code of portions of this program with the |
1415 | + * OpenSSL library under certain conditions as described in each |
1416 | + * individual source file, and distribute linked combinations |
1417 | + * including the two. |
1418 | + * |
1419 | + * You must obey the GNU General Public License in all respects |
1420 | + * for all of the code used other than OpenSSL. If you modify |
1421 | + * file(s) with this exception, you may extend this exception to your |
1422 | + * version of the file(s), but you are not obligated to do so. If you |
1423 | + * do not wish to do so, delete this exception statement from your |
1424 | + * version. If you delete this exception statement from all source |
1425 | + * files in the program, then also delete it here. |
1426 | + * |
1427 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1428 | */ |
1429 | |
1430 | |
1431 | === modified file 'src/plugin/Evernote/jobs/fetchusernamejob.cpp' |
1432 | --- src/plugin/Evernote/jobs/fetchusernamejob.cpp 2014-01-27 13:00:41 +0000 |
1433 | +++ src/plugin/Evernote/jobs/fetchusernamejob.cpp 2014-05-09 18:12:38 +0000 |
1434 | @@ -15,6 +15,20 @@ |
1435 | * You should have received a copy of the GNU General Public License |
1436 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1437 | * |
1438 | + * In addition, as a special exception, the copyright holders give |
1439 | + * permission to link the code of portions of this program with the |
1440 | + * OpenSSL library under certain conditions as described in each |
1441 | + * individual source file, and distribute linked combinations |
1442 | + * including the two. |
1443 | + * |
1444 | + * You must obey the GNU General Public License in all respects |
1445 | + * for all of the code used other than OpenSSL. If you modify |
1446 | + * file(s) with this exception, you may extend this exception to your |
1447 | + * version of the file(s), but you are not obligated to do so. If you |
1448 | + * do not wish to do so, delete this exception statement from your |
1449 | + * version. If you delete this exception statement from all source |
1450 | + * files in the program, then also delete it here. |
1451 | + * |
1452 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1453 | */ |
1454 | |
1455 | |
1456 | === modified file 'src/plugin/Evernote/jobs/fetchusernamejob.h' |
1457 | --- src/plugin/Evernote/jobs/fetchusernamejob.h 2014-01-27 13:00:41 +0000 |
1458 | +++ src/plugin/Evernote/jobs/fetchusernamejob.h 2014-05-09 18:12:38 +0000 |
1459 | @@ -15,6 +15,20 @@ |
1460 | * You should have received a copy of the GNU General Public License |
1461 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1462 | * |
1463 | + * In addition, as a special exception, the copyright holders give |
1464 | + * permission to link the code of portions of this program with the |
1465 | + * OpenSSL library under certain conditions as described in each |
1466 | + * individual source file, and distribute linked combinations |
1467 | + * including the two. |
1468 | + * |
1469 | + * You must obey the GNU General Public License in all respects |
1470 | + * for all of the code used other than OpenSSL. If you modify |
1471 | + * file(s) with this exception, you may extend this exception to your |
1472 | + * version of the file(s), but you are not obligated to do so. If you |
1473 | + * do not wish to do so, delete this exception statement from your |
1474 | + * version. If you delete this exception statement from all source |
1475 | + * files in the program, then also delete it here. |
1476 | + * |
1477 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1478 | */ |
1479 | |
1480 | |
1481 | === modified file 'src/plugin/Evernote/jobs/notesstorejob.cpp' |
1482 | --- src/plugin/Evernote/jobs/notesstorejob.cpp 2014-04-30 21:53:07 +0000 |
1483 | +++ src/plugin/Evernote/jobs/notesstorejob.cpp 2014-05-09 18:12:38 +0000 |
1484 | @@ -15,6 +15,20 @@ |
1485 | * You should have received a copy of the GNU General Public License |
1486 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1487 | * |
1488 | + * In addition, as a special exception, the copyright holders give |
1489 | + * permission to link the code of portions of this program with the |
1490 | + * OpenSSL library under certain conditions as described in each |
1491 | + * individual source file, and distribute linked combinations |
1492 | + * including the two. |
1493 | + * |
1494 | + * You must obey the GNU General Public License in all respects |
1495 | + * for all of the code used other than OpenSSL. If you modify |
1496 | + * file(s) with this exception, you may extend this exception to your |
1497 | + * version of the file(s), but you are not obligated to do so. If you |
1498 | + * do not wish to do so, delete this exception statement from your |
1499 | + * version. If you delete this exception statement from all source |
1500 | + * files in the program, then also delete it here. |
1501 | + * |
1502 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1503 | */ |
1504 | |
1505 | |
1506 | === modified file 'src/plugin/Evernote/jobs/notesstorejob.h' |
1507 | --- src/plugin/Evernote/jobs/notesstorejob.h 2014-01-27 13:00:41 +0000 |
1508 | +++ src/plugin/Evernote/jobs/notesstorejob.h 2014-05-09 18:12:38 +0000 |
1509 | @@ -15,6 +15,20 @@ |
1510 | * You should have received a copy of the GNU General Public License |
1511 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1512 | * |
1513 | + * In addition, as a special exception, the copyright holders give |
1514 | + * permission to link the code of portions of this program with the |
1515 | + * OpenSSL library under certain conditions as described in each |
1516 | + * individual source file, and distribute linked combinations |
1517 | + * including the two. |
1518 | + * |
1519 | + * You must obey the GNU General Public License in all respects |
1520 | + * for all of the code used other than OpenSSL. If you modify |
1521 | + * file(s) with this exception, you may extend this exception to your |
1522 | + * version of the file(s), but you are not obligated to do so. If you |
1523 | + * do not wish to do so, delete this exception statement from your |
1524 | + * version. If you delete this exception statement from all source |
1525 | + * files in the program, then also delete it here. |
1526 | + * |
1527 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1528 | */ |
1529 | |
1530 | |
1531 | === modified file 'src/plugin/Evernote/jobs/savenotejob.cpp' |
1532 | --- src/plugin/Evernote/jobs/savenotejob.cpp 2014-01-27 13:00:41 +0000 |
1533 | +++ src/plugin/Evernote/jobs/savenotejob.cpp 2014-05-09 18:12:38 +0000 |
1534 | @@ -15,6 +15,20 @@ |
1535 | * You should have received a copy of the GNU General Public License |
1536 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1537 | * |
1538 | + * In addition, as a special exception, the copyright holders give |
1539 | + * permission to link the code of portions of this program with the |
1540 | + * OpenSSL library under certain conditions as described in each |
1541 | + * individual source file, and distribute linked combinations |
1542 | + * including the two. |
1543 | + * |
1544 | + * You must obey the GNU General Public License in all respects |
1545 | + * for all of the code used other than OpenSSL. If you modify |
1546 | + * file(s) with this exception, you may extend this exception to your |
1547 | + * version of the file(s), but you are not obligated to do so. If you |
1548 | + * do not wish to do so, delete this exception statement from your |
1549 | + * version. If you delete this exception statement from all source |
1550 | + * files in the program, then also delete it here. |
1551 | + * |
1552 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1553 | */ |
1554 | |
1555 | |
1556 | === modified file 'src/plugin/Evernote/jobs/savenotejob.h' |
1557 | --- src/plugin/Evernote/jobs/savenotejob.h 2014-01-27 13:00:41 +0000 |
1558 | +++ src/plugin/Evernote/jobs/savenotejob.h 2014-05-09 18:12:38 +0000 |
1559 | @@ -15,6 +15,20 @@ |
1560 | * You should have received a copy of the GNU General Public License |
1561 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1562 | * |
1563 | + * In addition, as a special exception, the copyright holders give |
1564 | + * permission to link the code of portions of this program with the |
1565 | + * OpenSSL library under certain conditions as described in each |
1566 | + * individual source file, and distribute linked combinations |
1567 | + * including the two. |
1568 | + * |
1569 | + * You must obey the GNU General Public License in all respects |
1570 | + * for all of the code used other than OpenSSL. If you modify |
1571 | + * file(s) with this exception, you may extend this exception to your |
1572 | + * version of the file(s), but you are not obligated to do so. If you |
1573 | + * do not wish to do so, delete this exception statement from your |
1574 | + * version. If you delete this exception statement from all source |
1575 | + * files in the program, then also delete it here. |
1576 | + * |
1577 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1578 | */ |
1579 | |
1580 | |
1581 | === modified file 'src/plugin/Evernote/jobs/userstorejob.cpp' |
1582 | --- src/plugin/Evernote/jobs/userstorejob.cpp 2014-04-30 21:53:07 +0000 |
1583 | +++ src/plugin/Evernote/jobs/userstorejob.cpp 2014-05-09 18:12:38 +0000 |
1584 | @@ -15,6 +15,20 @@ |
1585 | * You should have received a copy of the GNU General Public License |
1586 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1587 | * |
1588 | + * In addition, as a special exception, the copyright holders give |
1589 | + * permission to link the code of portions of this program with the |
1590 | + * OpenSSL library under certain conditions as described in each |
1591 | + * individual source file, and distribute linked combinations |
1592 | + * including the two. |
1593 | + * |
1594 | + * You must obey the GNU General Public License in all respects |
1595 | + * for all of the code used other than OpenSSL. If you modify |
1596 | + * file(s) with this exception, you may extend this exception to your |
1597 | + * version of the file(s), but you are not obligated to do so. If you |
1598 | + * do not wish to do so, delete this exception statement from your |
1599 | + * version. If you delete this exception statement from all source |
1600 | + * files in the program, then also delete it here. |
1601 | + * |
1602 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1603 | */ |
1604 | |
1605 | |
1606 | === modified file 'src/plugin/Evernote/jobs/userstorejob.h' |
1607 | --- src/plugin/Evernote/jobs/userstorejob.h 2014-01-27 13:00:41 +0000 |
1608 | +++ src/plugin/Evernote/jobs/userstorejob.h 2014-05-09 18:12:38 +0000 |
1609 | @@ -15,6 +15,20 @@ |
1610 | * You should have received a copy of the GNU General Public License |
1611 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1612 | * |
1613 | + * In addition, as a special exception, the copyright holders give |
1614 | + * permission to link the code of portions of this program with the |
1615 | + * OpenSSL library under certain conditions as described in each |
1616 | + * individual source file, and distribute linked combinations |
1617 | + * including the two. |
1618 | + * |
1619 | + * You must obey the GNU General Public License in all respects |
1620 | + * for all of the code used other than OpenSSL. If you modify |
1621 | + * file(s) with this exception, you may extend this exception to your |
1622 | + * version of the file(s), but you are not obligated to do so. If you |
1623 | + * do not wish to do so, delete this exception statement from your |
1624 | + * version. If you delete this exception statement from all source |
1625 | + * files in the program, then also delete it here. |
1626 | + * |
1627 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1628 | */ |
1629 | |
1630 | |
1631 | === modified file 'src/plugin/Evernote/note.cpp' |
1632 | --- src/plugin/Evernote/note.cpp 2014-05-09 13:02:38 +0000 |
1633 | +++ src/plugin/Evernote/note.cpp 2014-05-09 18:12:38 +0000 |
1634 | @@ -15,6 +15,20 @@ |
1635 | * You should have received a copy of the GNU General Public License |
1636 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1637 | * |
1638 | + * In addition, as a special exception, the copyright holders give |
1639 | + * permission to link the code of portions of this program with the |
1640 | + * OpenSSL library under certain conditions as described in each |
1641 | + * individual source file, and distribute linked combinations |
1642 | + * including the two. |
1643 | + * |
1644 | + * You must obey the GNU General Public License in all respects |
1645 | + * for all of the code used other than OpenSSL. If you modify |
1646 | + * file(s) with this exception, you may extend this exception to your |
1647 | + * version of the file(s), but you are not obligated to do so. If you |
1648 | + * do not wish to do so, delete this exception statement from your |
1649 | + * version. If you delete this exception statement from all source |
1650 | + * files in the program, then also delete it here. |
1651 | + * |
1652 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1653 | */ |
1654 | |
1655 | |
1656 | === modified file 'src/plugin/Evernote/note.h' |
1657 | --- src/plugin/Evernote/note.h 2014-05-09 13:02:38 +0000 |
1658 | +++ src/plugin/Evernote/note.h 2014-05-09 18:12:38 +0000 |
1659 | @@ -15,6 +15,20 @@ |
1660 | * You should have received a copy of the GNU General Public License |
1661 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1662 | * |
1663 | + * In addition, as a special exception, the copyright holders give |
1664 | + * permission to link the code of portions of this program with the |
1665 | + * OpenSSL library under certain conditions as described in each |
1666 | + * individual source file, and distribute linked combinations |
1667 | + * including the two. |
1668 | + * |
1669 | + * You must obey the GNU General Public License in all respects |
1670 | + * for all of the code used other than OpenSSL. If you modify |
1671 | + * file(s) with this exception, you may extend this exception to your |
1672 | + * version of the file(s), but you are not obligated to do so. If you |
1673 | + * do not wish to do so, delete this exception statement from your |
1674 | + * version. If you delete this exception statement from all source |
1675 | + * files in the program, then also delete it here. |
1676 | + * |
1677 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1678 | */ |
1679 | |
1680 | |
1681 | === modified file 'src/plugin/Evernote/notebook.cpp' |
1682 | --- src/plugin/Evernote/notebook.cpp 2014-05-06 21:31:41 +0000 |
1683 | +++ src/plugin/Evernote/notebook.cpp 2014-05-09 18:12:38 +0000 |
1684 | @@ -15,6 +15,20 @@ |
1685 | * You should have received a copy of the GNU General Public License |
1686 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1687 | * |
1688 | + * In addition, as a special exception, the copyright holders give |
1689 | + * permission to link the code of portions of this program with the |
1690 | + * OpenSSL library under certain conditions as described in each |
1691 | + * individual source file, and distribute linked combinations |
1692 | + * including the two. |
1693 | + * |
1694 | + * You must obey the GNU General Public License in all respects |
1695 | + * for all of the code used other than OpenSSL. If you modify |
1696 | + * file(s) with this exception, you may extend this exception to your |
1697 | + * version of the file(s), but you are not obligated to do so. If you |
1698 | + * do not wish to do so, delete this exception statement from your |
1699 | + * version. If you delete this exception statement from all source |
1700 | + * files in the program, then also delete it here. |
1701 | + * |
1702 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1703 | */ |
1704 | |
1705 | |
1706 | === modified file 'src/plugin/Evernote/notebook.h' |
1707 | --- src/plugin/Evernote/notebook.h 2014-05-05 22:33:48 +0000 |
1708 | +++ src/plugin/Evernote/notebook.h 2014-05-09 18:12:38 +0000 |
1709 | @@ -15,6 +15,20 @@ |
1710 | * You should have received a copy of the GNU General Public License |
1711 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1712 | * |
1713 | + * In addition, as a special exception, the copyright holders give |
1714 | + * permission to link the code of portions of this program with the |
1715 | + * OpenSSL library under certain conditions as described in each |
1716 | + * individual source file, and distribute linked combinations |
1717 | + * including the two. |
1718 | + * |
1719 | + * You must obey the GNU General Public License in all respects |
1720 | + * for all of the code used other than OpenSSL. If you modify |
1721 | + * file(s) with this exception, you may extend this exception to your |
1722 | + * version of the file(s), but you are not obligated to do so. If you |
1723 | + * do not wish to do so, delete this exception statement from your |
1724 | + * version. If you delete this exception statement from all source |
1725 | + * files in the program, then also delete it here. |
1726 | + * |
1727 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1728 | */ |
1729 | |
1730 | |
1731 | === modified file 'src/plugin/Evernote/notebooks.cpp' |
1732 | --- src/plugin/Evernote/notebooks.cpp 2014-05-05 23:07:07 +0000 |
1733 | +++ src/plugin/Evernote/notebooks.cpp 2014-05-09 18:12:38 +0000 |
1734 | @@ -15,6 +15,20 @@ |
1735 | * You should have received a copy of the GNU General Public License |
1736 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1737 | * |
1738 | + * In addition, as a special exception, the copyright holders give |
1739 | + * permission to link the code of portions of this program with the |
1740 | + * OpenSSL library under certain conditions as described in each |
1741 | + * individual source file, and distribute linked combinations |
1742 | + * including the two. |
1743 | + * |
1744 | + * You must obey the GNU General Public License in all respects |
1745 | + * for all of the code used other than OpenSSL. If you modify |
1746 | + * file(s) with this exception, you may extend this exception to your |
1747 | + * version of the file(s), but you are not obligated to do so. If you |
1748 | + * do not wish to do so, delete this exception statement from your |
1749 | + * version. If you delete this exception statement from all source |
1750 | + * files in the program, then also delete it here. |
1751 | + * |
1752 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1753 | */ |
1754 | |
1755 | |
1756 | === modified file 'src/plugin/Evernote/notebooks.h' |
1757 | --- src/plugin/Evernote/notebooks.h 2014-05-05 23:07:07 +0000 |
1758 | +++ src/plugin/Evernote/notebooks.h 2014-05-09 18:12:38 +0000 |
1759 | @@ -15,6 +15,20 @@ |
1760 | * You should have received a copy of the GNU General Public License |
1761 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1762 | * |
1763 | + * In addition, as a special exception, the copyright holders give |
1764 | + * permission to link the code of portions of this program with the |
1765 | + * OpenSSL library under certain conditions as described in each |
1766 | + * individual source file, and distribute linked combinations |
1767 | + * including the two. |
1768 | + * |
1769 | + * You must obey the GNU General Public License in all respects |
1770 | + * for all of the code used other than OpenSSL. If you modify |
1771 | + * file(s) with this exception, you may extend this exception to your |
1772 | + * version of the file(s), but you are not obligated to do so. If you |
1773 | + * do not wish to do so, delete this exception statement from your |
1774 | + * version. If you delete this exception statement from all source |
1775 | + * files in the program, then also delete it here. |
1776 | + * |
1777 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1778 | */ |
1779 | |
1780 | |
1781 | === modified file 'src/plugin/Evernote/notes.cpp' |
1782 | --- src/plugin/Evernote/notes.cpp 2014-05-08 16:30:57 +0000 |
1783 | +++ src/plugin/Evernote/notes.cpp 2014-05-09 18:12:38 +0000 |
1784 | @@ -15,6 +15,20 @@ |
1785 | * You should have received a copy of the GNU General Public License |
1786 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1787 | * |
1788 | + * In addition, as a special exception, the copyright holders give |
1789 | + * permission to link the code of portions of this program with the |
1790 | + * OpenSSL library under certain conditions as described in each |
1791 | + * individual source file, and distribute linked combinations |
1792 | + * including the two. |
1793 | + * |
1794 | + * You must obey the GNU General Public License in all respects |
1795 | + * for all of the code used other than OpenSSL. If you modify |
1796 | + * file(s) with this exception, you may extend this exception to your |
1797 | + * version of the file(s), but you are not obligated to do so. If you |
1798 | + * do not wish to do so, delete this exception statement from your |
1799 | + * version. If you delete this exception statement from all source |
1800 | + * files in the program, then also delete it here. |
1801 | + * |
1802 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1803 | */ |
1804 | |
1805 | |
1806 | === modified file 'src/plugin/Evernote/notes.h' |
1807 | --- src/plugin/Evernote/notes.h 2014-05-06 20:05:25 +0000 |
1808 | +++ src/plugin/Evernote/notes.h 2014-05-09 18:12:38 +0000 |
1809 | @@ -15,6 +15,20 @@ |
1810 | * You should have received a copy of the GNU General Public License |
1811 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1812 | * |
1813 | + * In addition, as a special exception, the copyright holders give |
1814 | + * permission to link the code of portions of this program with the |
1815 | + * OpenSSL library under certain conditions as described in each |
1816 | + * individual source file, and distribute linked combinations |
1817 | + * including the two. |
1818 | + * |
1819 | + * You must obey the GNU General Public License in all respects |
1820 | + * for all of the code used other than OpenSSL. If you modify |
1821 | + * file(s) with this exception, you may extend this exception to your |
1822 | + * version of the file(s), but you are not obligated to do so. If you |
1823 | + * do not wish to do so, delete this exception statement from your |
1824 | + * version. If you delete this exception statement from all source |
1825 | + * files in the program, then also delete it here. |
1826 | + * |
1827 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1828 | */ |
1829 | |
1830 | |
1831 | === modified file 'src/plugin/Evernote/notesstore.cpp' |
1832 | --- src/plugin/Evernote/notesstore.cpp 2014-05-09 09:02:54 +0000 |
1833 | +++ src/plugin/Evernote/notesstore.cpp 2014-05-09 18:12:38 +0000 |
1834 | @@ -15,6 +15,20 @@ |
1835 | * You should have received a copy of the GNU General Public License |
1836 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1837 | * |
1838 | + * In addition, as a special exception, the copyright holders give |
1839 | + * permission to link the code of portions of this program with the |
1840 | + * OpenSSL library under certain conditions as described in each |
1841 | + * individual source file, and distribute linked combinations |
1842 | + * including the two. |
1843 | + * |
1844 | + * You must obey the GNU General Public License in all respects |
1845 | + * for all of the code used other than OpenSSL. If you modify |
1846 | + * file(s) with this exception, you may extend this exception to your |
1847 | + * version of the file(s), but you are not obligated to do so. If you |
1848 | + * do not wish to do so, delete this exception statement from your |
1849 | + * version. If you delete this exception statement from all source |
1850 | + * files in the program, then also delete it here. |
1851 | + * |
1852 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1853 | */ |
1854 | |
1855 | |
1856 | === modified file 'src/plugin/Evernote/notesstore.h' |
1857 | --- src/plugin/Evernote/notesstore.h 2014-05-09 09:02:54 +0000 |
1858 | +++ src/plugin/Evernote/notesstore.h 2014-05-09 18:12:38 +0000 |
1859 | @@ -15,6 +15,20 @@ |
1860 | * You should have received a copy of the GNU General Public License |
1861 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1862 | * |
1863 | + * In addition, as a special exception, the copyright holders give |
1864 | + * permission to link the code of portions of this program with the |
1865 | + * OpenSSL library under certain conditions as described in each |
1866 | + * individual source file, and distribute linked combinations |
1867 | + * including the two. |
1868 | + * |
1869 | + * You must obey the GNU General Public License in all respects |
1870 | + * for all of the code used other than OpenSSL. If you modify |
1871 | + * file(s) with this exception, you may extend this exception to your |
1872 | + * version of the file(s), but you are not obligated to do so. If you |
1873 | + * do not wish to do so, delete this exception statement from your |
1874 | + * version. If you delete this exception statement from all source |
1875 | + * files in the program, then also delete it here. |
1876 | + * |
1877 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1878 | */ |
1879 | |
1880 | |
1881 | === modified file 'src/plugin/Evernote/resource.cpp' |
1882 | --- src/plugin/Evernote/resource.cpp 2014-05-06 20:48:29 +0000 |
1883 | +++ src/plugin/Evernote/resource.cpp 2014-05-09 18:12:38 +0000 |
1884 | @@ -15,6 +15,20 @@ |
1885 | * You should have received a copy of the GNU General Public License |
1886 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1887 | * |
1888 | + * In addition, as a special exception, the copyright holders give |
1889 | + * permission to link the code of portions of this program with the |
1890 | + * OpenSSL library under certain conditions as described in each |
1891 | + * individual source file, and distribute linked combinations |
1892 | + * including the two. |
1893 | + * |
1894 | + * You must obey the GNU General Public License in all respects |
1895 | + * for all of the code used other than OpenSSL. If you modify |
1896 | + * file(s) with this exception, you may extend this exception to your |
1897 | + * version of the file(s), but you are not obligated to do so. If you |
1898 | + * do not wish to do so, delete this exception statement from your |
1899 | + * version. If you delete this exception statement from all source |
1900 | + * files in the program, then also delete it here. |
1901 | + * |
1902 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1903 | */ |
1904 | |
1905 | |
1906 | === modified file 'src/plugin/Evernote/resource.h' |
1907 | --- src/plugin/Evernote/resource.h 2014-05-06 19:30:14 +0000 |
1908 | +++ src/plugin/Evernote/resource.h 2014-05-09 18:12:38 +0000 |
1909 | @@ -15,6 +15,20 @@ |
1910 | * You should have received a copy of the GNU General Public License |
1911 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1912 | * |
1913 | + * In addition, as a special exception, the copyright holders give |
1914 | + * permission to link the code of portions of this program with the |
1915 | + * OpenSSL library under certain conditions as described in each |
1916 | + * individual source file, and distribute linked combinations |
1917 | + * including the two. |
1918 | + * |
1919 | + * You must obey the GNU General Public License in all respects |
1920 | + * for all of the code used other than OpenSSL. If you modify |
1921 | + * file(s) with this exception, you may extend this exception to your |
1922 | + * version of the file(s), but you are not obligated to do so. If you |
1923 | + * do not wish to do so, delete this exception statement from your |
1924 | + * version. If you delete this exception statement from all source |
1925 | + * files in the program, then also delete it here. |
1926 | + * |
1927 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1928 | */ |
1929 | |
1930 | |
1931 | === modified file 'src/plugin/Evernote/resourceimageprovider.cpp' |
1932 | --- src/plugin/Evernote/resourceimageprovider.cpp 2014-05-06 19:30:14 +0000 |
1933 | +++ src/plugin/Evernote/resourceimageprovider.cpp 2014-05-09 18:12:38 +0000 |
1934 | @@ -1,3 +1,37 @@ |
1935 | +/* |
1936 | + * Copyright: 2013 Canonical, Ltd |
1937 | + * |
1938 | + * This file is part of reminders |
1939 | + * |
1940 | + * reminders is free software: you can redistribute it and/or modify |
1941 | + * it under the terms of the GNU General Public License as published by |
1942 | + * the Free Software Foundation; version 3. |
1943 | + * |
1944 | + * reminders is distributed in the hope that it will be useful, |
1945 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
1946 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1947 | + * GNU General Public License for more details. |
1948 | + * |
1949 | + * You should have received a copy of the GNU General Public License |
1950 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1951 | + * |
1952 | + * In addition, as a special exception, the copyright holders give |
1953 | + * permission to link the code of portions of this program with the |
1954 | + * OpenSSL library under certain conditions as described in each |
1955 | + * individual source file, and distribute linked combinations |
1956 | + * including the two. |
1957 | + * |
1958 | + * You must obey the GNU General Public License in all respects |
1959 | + * for all of the code used other than OpenSSL. If you modify |
1960 | + * file(s) with this exception, you may extend this exception to your |
1961 | + * version of the file(s), but you are not obligated to do so. If you |
1962 | + * do not wish to do so, delete this exception statement from your |
1963 | + * version. If you delete this exception statement from all source |
1964 | + * files in the program, then also delete it here. |
1965 | + * |
1966 | + * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
1967 | + */ |
1968 | + |
1969 | #include "resourceimageprovider.h" |
1970 | |
1971 | #include <notesstore.h> |
1972 | |
1973 | === modified file 'src/plugin/Evernote/resourceimageprovider.h' |
1974 | --- src/plugin/Evernote/resourceimageprovider.h 2013-12-14 22:38:57 +0000 |
1975 | +++ src/plugin/Evernote/resourceimageprovider.h 2014-05-09 18:12:38 +0000 |
1976 | @@ -1,3 +1,37 @@ |
1977 | +/* |
1978 | + * Copyright: 2013 Canonical, Ltd |
1979 | + * |
1980 | + * This file is part of reminders |
1981 | + * |
1982 | + * reminders is free software: you can redistribute it and/or modify |
1983 | + * it under the terms of the GNU General Public License as published by |
1984 | + * the Free Software Foundation; version 3. |
1985 | + * |
1986 | + * reminders is distributed in the hope that it will be useful, |
1987 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
1988 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1989 | + * GNU General Public License for more details. |
1990 | + * |
1991 | + * You should have received a copy of the GNU General Public License |
1992 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1993 | + * |
1994 | + * In addition, as a special exception, the copyright holders give |
1995 | + * permission to link the code of portions of this program with the |
1996 | + * OpenSSL library under certain conditions as described in each |
1997 | + * individual source file, and distribute linked combinations |
1998 | + * including the two. |
1999 | + * |
2000 | + * You must obey the GNU General Public License in all respects |
2001 | + * for all of the code used other than OpenSSL. If you modify |
2002 | + * file(s) with this exception, you may extend this exception to your |
2003 | + * version of the file(s), but you are not obligated to do so. If you |
2004 | + * do not wish to do so, delete this exception statement from your |
2005 | + * version. If you delete this exception statement from all source |
2006 | + * files in the program, then also delete it here. |
2007 | + * |
2008 | + * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
2009 | + */ |
2010 | + |
2011 | #ifndef RESOURCEIMAGEPROVIDER_H |
2012 | #define RESOURCEIMAGEPROVIDER_H |
2013 | |
2014 | |
2015 | === modified file 'src/plugin/Evernote/userstore.cpp' |
2016 | --- src/plugin/Evernote/userstore.cpp 2014-01-27 13:00:41 +0000 |
2017 | +++ src/plugin/Evernote/userstore.cpp 2014-05-09 18:12:38 +0000 |
2018 | @@ -15,6 +15,20 @@ |
2019 | * You should have received a copy of the GNU General Public License |
2020 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2021 | * |
2022 | + * In addition, as a special exception, the copyright holders give |
2023 | + * permission to link the code of portions of this program with the |
2024 | + * OpenSSL library under certain conditions as described in each |
2025 | + * individual source file, and distribute linked combinations |
2026 | + * including the two. |
2027 | + * |
2028 | + * You must obey the GNU General Public License in all respects |
2029 | + * for all of the code used other than OpenSSL. If you modify |
2030 | + * file(s) with this exception, you may extend this exception to your |
2031 | + * version of the file(s), but you are not obligated to do so. If you |
2032 | + * do not wish to do so, delete this exception statement from your |
2033 | + * version. If you delete this exception statement from all source |
2034 | + * files in the program, then also delete it here. |
2035 | + * |
2036 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
2037 | */ |
2038 | |
2039 | |
2040 | === modified file 'src/plugin/Evernote/userstore.h' |
2041 | --- src/plugin/Evernote/userstore.h 2014-01-27 13:00:41 +0000 |
2042 | +++ src/plugin/Evernote/userstore.h 2014-05-09 18:12:38 +0000 |
2043 | @@ -15,6 +15,20 @@ |
2044 | * You should have received a copy of the GNU General Public License |
2045 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2046 | * |
2047 | + * In addition, as a special exception, the copyright holders give |
2048 | + * permission to link the code of portions of this program with the |
2049 | + * OpenSSL library under certain conditions as described in each |
2050 | + * individual source file, and distribute linked combinations |
2051 | + * including the two. |
2052 | + * |
2053 | + * You must obey the GNU General Public License in all respects |
2054 | + * for all of the code used other than OpenSSL. If you modify |
2055 | + * file(s) with this exception, you may extend this exception to your |
2056 | + * version of the file(s), but you are not obligated to do so. If you |
2057 | + * do not wish to do so, delete this exception statement from your |
2058 | + * version. If you delete this exception statement from all source |
2059 | + * files in the program, then also delete it here. |
2060 | + * |
2061 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
2062 | */ |
2063 | |
2064 | |
2065 | === modified file 'src/plugin/Evernote/utils/enmldocument.cpp' |
2066 | --- src/plugin/Evernote/utils/enmldocument.cpp 2014-02-19 12:25:52 +0000 |
2067 | +++ src/plugin/Evernote/utils/enmldocument.cpp 2014-05-09 18:12:38 +0000 |
2068 | @@ -15,6 +15,20 @@ |
2069 | * You should have received a copy of the GNU General Public License |
2070 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2071 | * |
2072 | + * In addition, as a special exception, the copyright holders give |
2073 | + * permission to link the code of portions of this program with the |
2074 | + * OpenSSL library under certain conditions as described in each |
2075 | + * individual source file, and distribute linked combinations |
2076 | + * including the two. |
2077 | + * |
2078 | + * You must obey the GNU General Public License in all respects |
2079 | + * for all of the code used other than OpenSSL. If you modify |
2080 | + * file(s) with this exception, you may extend this exception to your |
2081 | + * version of the file(s), but you are not obligated to do so. If you |
2082 | + * do not wish to do so, delete this exception statement from your |
2083 | + * version. If you delete this exception statement from all source |
2084 | + * files in the program, then also delete it here. |
2085 | + * |
2086 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
2087 | */ |
2088 | |
2089 | |
2090 | === modified file 'src/plugin/Evernote/utils/enmldocument.h' |
2091 | --- src/plugin/Evernote/utils/enmldocument.h 2014-02-19 12:25:52 +0000 |
2092 | +++ src/plugin/Evernote/utils/enmldocument.h 2014-05-09 18:12:38 +0000 |
2093 | @@ -15,6 +15,20 @@ |
2094 | * You should have received a copy of the GNU General Public License |
2095 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2096 | * |
2097 | + * In addition, as a special exception, the copyright holders give |
2098 | + * permission to link the code of portions of this program with the |
2099 | + * OpenSSL library under certain conditions as described in each |
2100 | + * individual source file, and distribute linked combinations |
2101 | + * including the two. |
2102 | + * |
2103 | + * You must obey the GNU General Public License in all respects |
2104 | + * for all of the code used other than OpenSSL. If you modify |
2105 | + * file(s) with this exception, you may extend this exception to your |
2106 | + * version of the file(s), but you are not obligated to do so. If you |
2107 | + * do not wish to do so, delete this exception statement from your |
2108 | + * version. If you delete this exception statement from all source |
2109 | + * files in the program, then also delete it here. |
2110 | + * |
2111 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
2112 | */ |
2113 | |
2114 | |
2115 | === modified file 'src/plugin/Evernote/utils/textformat.cpp' |
2116 | --- src/plugin/Evernote/utils/textformat.cpp 2014-01-29 16:04:00 +0000 |
2117 | +++ src/plugin/Evernote/utils/textformat.cpp 2014-05-09 18:12:38 +0000 |
2118 | @@ -15,6 +15,20 @@ |
2119 | * You should have received a copy of the GNU General Public License |
2120 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2121 | * |
2122 | + * In addition, as a special exception, the copyright holders give |
2123 | + * permission to link the code of portions of this program with the |
2124 | + * OpenSSL library under certain conditions as described in each |
2125 | + * individual source file, and distribute linked combinations |
2126 | + * including the two. |
2127 | + * |
2128 | + * You must obey the GNU General Public License in all respects |
2129 | + * for all of the code used other than OpenSSL. If you modify |
2130 | + * file(s) with this exception, you may extend this exception to your |
2131 | + * version of the file(s), but you are not obligated to do so. If you |
2132 | + * do not wish to do so, delete this exception statement from your |
2133 | + * version. If you delete this exception statement from all source |
2134 | + * files in the program, then also delete it here. |
2135 | + * |
2136 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
2137 | */ |
2138 | |
2139 | |
2140 | === modified file 'src/plugin/Evernote/utils/textformat.h' |
2141 | --- src/plugin/Evernote/utils/textformat.h 2014-01-29 18:27:11 +0000 |
2142 | +++ src/plugin/Evernote/utils/textformat.h 2014-05-09 18:12:38 +0000 |
2143 | @@ -15,6 +15,20 @@ |
2144 | * You should have received a copy of the GNU General Public License |
2145 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2146 | * |
2147 | + * In addition, as a special exception, the copyright holders give |
2148 | + * permission to link the code of portions of this program with the |
2149 | + * OpenSSL library under certain conditions as described in each |
2150 | + * individual source file, and distribute linked combinations |
2151 | + * including the two. |
2152 | + * |
2153 | + * You must obey the GNU General Public License in all respects |
2154 | + * for all of the code used other than OpenSSL. If you modify |
2155 | + * file(s) with this exception, you may extend this exception to your |
2156 | + * version of the file(s), but you are not obligated to do so. If you |
2157 | + * do not wish to do so, delete this exception statement from your |
2158 | + * version. If you delete this exception statement from all source |
2159 | + * files in the program, then also delete it here. |
2160 | + * |
2161 | * Authors: Michael Zanetti <michael.zanetti@canonical.com> |
2162 | */ |
2163 |
Work in progress for now...