Merge lp:~intrigeri/apparmor-profiles/clarify-copyright-and-license into lp:apparmor-profiles

Proposed by intrigeri
Status: Merged
Merged at revision: 133
Proposed branch: lp:~intrigeri/apparmor-profiles/clarify-copyright-and-license
Merge into: lp:apparmor-profiles
Diff against target: 32 lines (+24/-1)
1 file modified
README (+24/-1)
To merge this branch: bzr merge lp:~intrigeri/apparmor-profiles/clarify-copyright-and-license
Reviewer Review Type Date Requested Status
AppArmor Developers Pending
Review via email: mp+231072@code.launchpad.net
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 'README'
2--- README 2011-07-14 12:39:15 +0000
3+++ README 2014-08-16 11:23:21 +0000
4@@ -43,4 +43,27 @@
5 http://wiki.apparmor.net/index.php/CommitPolicy
6
7
8-
9+---------
10+Copyright
11+---------
12+
13+Copyright (C) 2008-2014 AppArmor developers <apparmor@lists.ubuntu.com>
14+
15+
16+-------
17+License
18+-------
19+
20+This program 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 2 of the License, or
23+(at your option) any later version.
24+
25+This program is distributed in the hope that it will be useful,
26+but WITHOUT ANY WARRANTY; without even the implied warranty of
27+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
28+GNU General Public License for more details.
29+
30+You should have received a copy of the GNU General Public License along
31+with this program; if not, write to the Free Software Foundation, Inc.,
32+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

Subscribers

People subscribed via source and target branches

to status/vote changes: