Commit - rpms/selinux-policy - cbadf720ba59b4f705c54add75443524d71c1a4e

    Merge branch 'master' of http://oss.tresys.com/git/refpolicy
    
    Conflicts:
    	policy/modules/kernel/domain.if
    	policy/modules/services/xserver.te

Changelog

file modified

+1 -0

policy/modules/admin/vbetool.te

file modified

+12 -1

policy/modules/apps/wine.if

file modified

+4 -0

policy/modules/apps/wine.te

file modified

+12 -1

policy/modules/kernel/domain.if

file modified

+35 -5

policy/modules/kernel/domain.te

file modified

+9 -1

policy/modules/kernel/kernel.if

file modified

+20 -0

policy/modules/services/xserver.te

file modified

+2 -1

policy/modules/system/mount.te

file modified

+1 -1

policy/modules/system/unconfined.if

file modified

+1 -1

rpms / selinux-policy

Source Code

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

Merged and Committed by Dan Walsh 14 years ago

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