Steve Beattie 6e0996981b Merge from trunk commit 2059: ... Original message: Author: Mark Ramsell <mramsell@qazonline.net> Description: ubuntu-integration does not work properly with exo-open Bug-Ubuntu: https://launchpad.net/bugs/987578 Acked-By: Jamie Strandboge <jamie@canonical.com> Nominated-by: Steve Beattie <sbeattie@ubuntu.com> Acked-by: John Johansen <john.johansen@canonical.com>		2013-01-03 15:54:16 -08:00
..
apparmor/profiles/extras	Add the missing k permission for /etc/.pwd.lock to the userdel profile.	2012-02-13 10:50:37 +01:00
apparmor.d	Merge from trunk commit 2059:	2013-01-03 15:54:16 -08:00
apparmor-profiles.spec.in	as ACKed on IRC, drop the unused $Id$ tags everywhere	2010-12-20 12:29:10 -08:00
Makefile	Create /etc/apparmor.d/tunables/multiarch.d directory in profiles/Makefile	2012-01-03 23:41:07 +01:00