Ubuntu Clock App

Merge lp:~mzanetti/ubuntu-clock-app/relicense-lapmodel into lp:~nik90/ubuntu-clock-app/revert-copyright-header-change

  1. relicense-lapmodel
  2. Merge into revert-copyright-header-ch...
Proposed by Michael Zanetti on 2015-08-24
Status: Merged
Merged at revision: 360
Proposed branch: lp:~mzanetti/ubuntu-clock-app/relicense-lapmodel
Merge into: lp:~nik90/ubuntu-clock-app/revert-copyright-header-change
Diff against target: 27 lines (+2/-4)
2 files modified
backend/modules/Stopwatch/LapHistory/history.cpp (+1/-2)
backend/modules/Stopwatch/LapHistory/history.h (+1/-2)
To merge this branch: bzr merge lp:~mzanetti/ubuntu-clock-app/relicense-lapmodel
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan 2015-08-24 Pending
Review via email: mp+268906@code.launchpad.net

Commit Message

Relicense to GPLv3 only

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'backend/modules/Stopwatch/LapHistory/history.cpp'
2--- backend/modules/Stopwatch/LapHistory/history.cpp 2015-08-24 12:59:48 +0000
3+++ backend/modules/Stopwatch/LapHistory/history.cpp 2015-08-24 13:04:20 +0000
4@@ -4,8 +4,7 @@
5 * *
6 * This prject is free software: you can redistribute it and/or modify *
7 * it under the terms of the GNU General Public License as published by *
8- * the Free Software Foundation, either version 3 of the License, or *
9- * (at your option) any later version. *
10+ * the Free Software Foundation, version 3 of the License. *
11 * *
12 * This project is distributed in the hope that it will be useful, *
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of *
14
15=== modified file 'backend/modules/Stopwatch/LapHistory/history.h'
16--- backend/modules/Stopwatch/LapHistory/history.h 2015-08-24 12:59:48 +0000
17+++ backend/modules/Stopwatch/LapHistory/history.h 2015-08-24 13:04:20 +0000
18@@ -4,8 +4,7 @@
19 * *
20 * This prject is free software: you can redistribute it and/or modify *
21 * it under the terms of the GNU General Public License as published by *
22- * the Free Software Foundation, either version 3 of the License, or *
23- * (at your option) any later version. *
24+ * the Free Software Foundation, version 3 of the License. *
25 * *
26 * This project is distributed in the hope that it will be useful, *
27 * but WITHOUT ANY WARRANTY; without even the implied warranty of *

Subscribers

People subscribed via source and target branches