Merge lp:~kees/apparmor/test-merge into lp:apparmor/2.12

Proposed by Kees Cook on 2011-03-02
Status: Superseded
Proposed branch: lp:~kees/apparmor/test-merge
Merge into: lp:apparmor/2.12
Diff against target: 13 lines (+2/-1)
1 file modified
README (+2/-1)
To merge this branch: bzr merge lp:~kees/apparmor/test-merge
Reviewer Review Type Date Requested Status
AppArmor Developers 2011-03-02 Pending
Review via email: mp+51964@code.launchpad.net

Description of the change

Minor README update. Mostly doing this as a test for merge request email configurations.

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2010-07-26 16:26:26 +0000
3+++ README 2011-03-02 21:22:00 +0000
4@@ -17,7 +17,8 @@
5 and change_profile(2) to be used by non-GPL binaries).
6
7 For more information, you can read the techdoc.pdf (available after
8-building the parser) and http://apparmor.wiki.kernel.org.
9+building the parser) and by visiting the http://apparmor.net/ web
10+site.
11
12
13 -------------

Subscribers

People subscribed via source and target branches