Merge lp:~ajalkane/ubuntu-filemanager-app/copyrights into lp:ubuntu-filemanager-app

Proposed by Arto Jalkanen
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 21
Merged at revision: 21
Proposed branch: lp:~ajalkane/ubuntu-filemanager-app/copyrights
Merge into: lp:ubuntu-filemanager-app
Diff against target: 274 lines (+187/-0)
11 files modified
BookmarksPage.qml (+17/-0)
ConfirmDialog.qml (+17/-0)
ConfirmDialogWithInput.qml (+17/-0)
FileActionDialog.qml (+17/-0)
FileDetailsPopover.qml (+17/-0)
FileOperationProgressDialog.qml (+17/-0)
FolderListDelegate.qml (+17/-0)
FolderListPage.qml (+17/-0)
FolderListView.qml (+17/-0)
NotifyDialog.qml (+17/-0)
ubuntu-filemanager-app.qml (+17/-0)
To merge this branch: bzr merge lp:~ajalkane/ubuntu-filemanager-app/copyrights
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Arto Jalkanen cursory Approve
Review via email: mp+159460@code.launchpad.net

Commit message

Added Ubuntu copyrights to each QML

Description of the change

Added Ubuntu copyrights to each QML

To post a comment you must log in.
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

I guess copyrights are good to be explicitly included.

review: Approve (cursory)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'BookmarksPage.qml'
2--- BookmarksPage.qml 2013-03-05 20:53:42 +0000
3+++ BookmarksPage.qml 2013-04-17 18:01:38 +0000
4@@ -1,3 +1,20 @@
5+/*
6+ * Copyright (C) 2013 Canonical Ltd
7+ *
8+ * This program is free software: you can redistribute it and/or modify
9+ * it under the terms of the GNU General Public License version 3 as
10+ * published by the Free Software Foundation.
11+ *
12+ * This program is distributed in the hope that it will be useful,
13+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
14+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+ * GNU General Public License for more details.
16+ *
17+ * You should have received a copy of the GNU General Public License
18+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
19+ *
20+ * Authored by: Arto Jalkanen <ajalkane@gmail.com>
21+ */
22 import QtQuick 2.0
23 import Ubuntu.Components 0.1
24
25
26=== modified file 'ConfirmDialog.qml'
27--- ConfirmDialog.qml 2013-04-01 14:41:59 +0000
28+++ ConfirmDialog.qml 2013-04-17 18:01:38 +0000
29@@ -1,3 +1,20 @@
30+/*
31+ * Copyright (C) 2013 Canonical Ltd
32+ *
33+ * This program is free software: you can redistribute it and/or modify
34+ * it under the terms of the GNU General Public License version 3 as
35+ * published by the Free Software Foundation.
36+ *
37+ * This program is distributed in the hope that it will be useful,
38+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
39+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
40+ * GNU General Public License for more details.
41+ *
42+ * You should have received a copy of the GNU General Public License
43+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
44+ *
45+ * Authored by: Arto Jalkanen <ajalkane@gmail.com>
46+ */
47 import QtQuick 2.0
48 import Ubuntu.Components 0.1
49 import Ubuntu.Components.Popups 0.1
50
51=== modified file 'ConfirmDialogWithInput.qml'
52--- ConfirmDialogWithInput.qml 2013-04-01 17:13:15 +0000
53+++ ConfirmDialogWithInput.qml 2013-04-17 18:01:38 +0000
54@@ -1,3 +1,20 @@
55+/*
56+ * Copyright (C) 2013 Canonical Ltd
57+ *
58+ * This program is free software: you can redistribute it and/or modify
59+ * it under the terms of the GNU General Public License version 3 as
60+ * published by the Free Software Foundation.
61+ *
62+ * This program is distributed in the hope that it will be useful,
63+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
64+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
65+ * GNU General Public License for more details.
66+ *
67+ * You should have received a copy of the GNU General Public License
68+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
69+ *
70+ * Authored by: Arto Jalkanen <ajalkane@gmail.com>
71+ */
72 import QtQuick 2.0
73 import Ubuntu.Components 0.1
74 import Ubuntu.Components.Popups 0.1
75
76=== modified file 'FileActionDialog.qml'
77--- FileActionDialog.qml 2013-03-18 21:23:08 +0000
78+++ FileActionDialog.qml 2013-04-17 18:01:38 +0000
79@@ -1,3 +1,20 @@
80+/*
81+ * Copyright (C) 2013 Canonical Ltd
82+ *
83+ * This program is free software: you can redistribute it and/or modify
84+ * it under the terms of the GNU General Public License version 3 as
85+ * published by the Free Software Foundation.
86+ *
87+ * This program is distributed in the hope that it will be useful,
88+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
89+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
90+ * GNU General Public License for more details.
91+ *
92+ * You should have received a copy of the GNU General Public License
93+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
94+ *
95+ * Authored by: Arto Jalkanen <ajalkane@gmail.com>
96+ */
97 import QtQuick 2.0
98 import Ubuntu.Components 0.1
99 import Ubuntu.Components.Popups 0.1
100
101=== modified file 'FileDetailsPopover.qml'
102--- FileDetailsPopover.qml 2013-03-13 21:14:52 +0000
103+++ FileDetailsPopover.qml 2013-04-17 18:01:38 +0000
104@@ -1,3 +1,20 @@
105+/*
106+ * Copyright (C) 2013 Canonical Ltd
107+ *
108+ * This program is free software: you can redistribute it and/or modify
109+ * it under the terms of the GNU General Public License version 3 as
110+ * published by the Free Software Foundation.
111+ *
112+ * This program is distributed in the hope that it will be useful,
113+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
114+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
115+ * GNU General Public License for more details.
116+ *
117+ * You should have received a copy of the GNU General Public License
118+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
119+ *
120+ * Authored by: Arto Jalkanen <ajalkane@gmail.com>
121+ */
122 import QtQuick 2.0
123 import Ubuntu.Components 0.1
124 import Ubuntu.Components.Popups 0.1
125
126=== modified file 'FileOperationProgressDialog.qml'
127--- FileOperationProgressDialog.qml 2013-04-16 16:51:21 +0000
128+++ FileOperationProgressDialog.qml 2013-04-17 18:01:38 +0000
129@@ -1,3 +1,20 @@
130+/*
131+ * Copyright (C) 2013 Canonical Ltd
132+ *
133+ * This program is free software: you can redistribute it and/or modify
134+ * it under the terms of the GNU General Public License version 3 as
135+ * published by the Free Software Foundation.
136+ *
137+ * This program is distributed in the hope that it will be useful,
138+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
139+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
140+ * GNU General Public License for more details.
141+ *
142+ * You should have received a copy of the GNU General Public License
143+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
144+ *
145+ * Authored by: Arto Jalkanen <ajalkane@gmail.com>
146+ */
147 import QtQuick 2.0
148 import Ubuntu.Components 0.1
149 import Ubuntu.Components.Popups 0.1
150
151=== modified file 'FolderListDelegate.qml'
152--- FolderListDelegate.qml 2013-03-12 20:34:33 +0000
153+++ FolderListDelegate.qml 2013-04-17 18:01:38 +0000
154@@ -1,3 +1,20 @@
155+/*
156+ * Copyright (C) 2013 Canonical Ltd
157+ *
158+ * This program is free software: you can redistribute it and/or modify
159+ * it under the terms of the GNU General Public License version 3 as
160+ * published by the Free Software Foundation.
161+ *
162+ * This program is distributed in the hope that it will be useful,
163+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
164+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
165+ * GNU General Public License for more details.
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+ * Authored by: Arto Jalkanen <ajalkane@gmail.com>
171+ */
172 import QtQuick 2.0
173 import Ubuntu.Components 0.1
174 import Ubuntu.Components.ListItems 0.1 as ListItem
175
176=== modified file 'FolderListPage.qml'
177--- FolderListPage.qml 2013-04-16 16:51:21 +0000
178+++ FolderListPage.qml 2013-04-17 18:01:38 +0000
179@@ -1,3 +1,20 @@
180+/*
181+ * Copyright (C) 2013 Canonical Ltd
182+ *
183+ * This program is free software: you can redistribute it and/or modify
184+ * it under the terms of the GNU General Public License version 3 as
185+ * published by the Free Software Foundation.
186+ *
187+ * This program is distributed in the hope that it will be useful,
188+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
189+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
190+ * GNU General Public License for more details.
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+ * Authored by: Arto Jalkanen <ajalkane@gmail.com>
196+ */
197 import QtQuick 2.0
198 import Ubuntu.Components 0.1
199 import Ubuntu.Components.Popups 0.1
200
201=== modified file 'FolderListView.qml'
202--- FolderListView.qml 2013-04-16 16:51:21 +0000
203+++ FolderListView.qml 2013-04-17 18:01:38 +0000
204@@ -1,3 +1,20 @@
205+/*
206+ * Copyright (C) 2013 Canonical Ltd
207+ *
208+ * This program is free software: you can redistribute it and/or modify
209+ * it under the terms of the GNU General Public License version 3 as
210+ * published by the Free Software Foundation.
211+ *
212+ * This program is distributed in the hope that it will be useful,
213+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
214+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
215+ * GNU General Public License for more details.
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+ * Authored by: Arto Jalkanen <ajalkane@gmail.com>
221+ */
222 import QtQuick 2.0
223 import Ubuntu.Components 0.1
224 import Ubuntu.Components.Popups 0.1
225
226=== modified file 'NotifyDialog.qml'
227--- NotifyDialog.qml 2013-04-01 17:25:23 +0000
228+++ NotifyDialog.qml 2013-04-17 18:01:38 +0000
229@@ -1,3 +1,20 @@
230+/*
231+ * Copyright (C) 2013 Canonical Ltd
232+ *
233+ * This program is free software: you can redistribute it and/or modify
234+ * it under the terms of the GNU General Public License version 3 as
235+ * published by the Free Software Foundation.
236+ *
237+ * This program is distributed in the hope that it will be useful,
238+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
239+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
240+ * GNU General Public License for more details.
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+ * Authored by: Arto Jalkanen <ajalkane@gmail.com>
246+ */
247 import QtQuick 2.0
248 import Ubuntu.Components 0.1
249 import Ubuntu.Components.Popups 0.1
250
251=== modified file 'ubuntu-filemanager-app.qml'
252--- ubuntu-filemanager-app.qml 2013-04-11 21:15:17 +0000
253+++ ubuntu-filemanager-app.qml 2013-04-17 18:01:38 +0000
254@@ -1,3 +1,20 @@
255+/*
256+ * Copyright (C) 2013 Canonical Ltd
257+ *
258+ * This program is free software: you can redistribute it and/or modify
259+ * it under the terms of the GNU General Public License version 3 as
260+ * published by the Free Software Foundation.
261+ *
262+ * This program is distributed in the hope that it will be useful,
263+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
264+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
265+ * GNU General Public License for more details.
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+ * Authored by: Arto Jalkanen <ajalkane@gmail.com>
271+ */
272 import QtQuick 2.0
273 import Ubuntu.Components 0.1
274 import org.nemomobile.folderlistmodel 1.0

Subscribers

People subscribed via source and target branches