]>
git.ipfire.org Git - people/stevee/selinux-policy.git/commit - policy/modules/apps/mplayer.te
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy
Conflicts:
policy/modules/kernel/kernel.if
policy/modules/services/portreserve.if
policy/modules/services/smokeping.te
policy/modules/services/ulogd.te
policy/modules/services/uucp.te
policy/modules/system/miscfiles.fc
policy/modules/system/mount.te
policy/support/obj_perm_sets.spt
18 files changed:
projects / people / stevee / selinux-policy.git / commit
