]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit - policy/modules/apps/mono.if
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'maste...
authorMiroslav Grepl <mgrepl@redhat.com>
Wed, 16 Feb 2011 18:05:11 +0000 (18:05 +0000)
committerMiroslav Grepl <mgrepl@redhat.com>
Wed, 16 Feb 2011 18:05:11 +0000 (18:05 +0000)
commit90040c7e17f3ba561bd9974be2a2fd92fba03172
tree6d08a8d75035d6d728323517157850b2fabf12c8
parent9ba3eded1ecff7d727370ab88954344c5a5f0212
parentd1d0493aacb3a5143c2f473505164d78ee72ce31
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy

Conflicts:
policy/modules/services/apache.if
policy/modules/services/tcsd.fc
policy/modules/services/tcsd.if
policy/modules/services/xserver.te
policy/modules/system/xen.fc
policy/modules/system/xen.te
16 files changed:
policy/modules/admin/sudo.te
policy/modules/kernel/devices.fc
policy/modules/kernel/devices.te
policy/modules/services/apache.if
policy/modules/services/apache.te
policy/modules/services/tcsd.if
policy/modules/services/xserver.te
policy/modules/system/authlogin.fc
policy/modules/system/init.te
policy/modules/system/lvm.te
policy/modules/system/modutils.te
policy/modules/system/raid.te
policy/modules/system/udev.fc
policy/modules/system/udev.te
policy/modules/system/xen.fc
policy/modules/system/xen.te