git.ipfire.org Git - people/stevee/selinux-policy.git/commit

]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit

Merge branch 'master' of http://oss.tresys.com/git/refpolicy

Conflicts:
policy/modules/kernel/domain.if
policy/modules/services/xserver.te

The IPFire selinux policy.

policy/modules/admin/vbetool.te	diff1 \|	diff2 \|	blob \| history
policy/modules/apps/wine.if	diff1 \|	diff2 \|	blob \| history
policy/modules/apps/wine.te	diff1 \|	diff2 \|	blob \| history
policy/modules/kernel/domain.if	diff1 \|	diff2 \|	blob \| history
policy/modules/kernel/domain.te	diff1 \|	diff2 \|	blob \| history
policy/modules/kernel/kernel.if	diff1 \|	diff2 \|	blob \| history
policy/modules/services/xserver.te	diff1 \|	diff2 \|	blob \| history
policy/modules/system/mount.te	diff1 \|	diff2 \|	blob \| history
policy/modules/system/unconfined.if	diff1 \|	diff2 \|	blob \| history