]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit - policy/modules/roles/unprivuser.te
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'maste...
authorDan Walsh <dwalsh@redhat.com>
Tue, 8 Feb 2011 21:57:46 +0000 (16:57 -0500)
committerDan Walsh <dwalsh@redhat.com>
Tue, 8 Feb 2011 21:57:46 +0000 (16:57 -0500)
commit6579ad3db48797b9dfd2205439d591bd0e3a9eb8
tree193d03dec4c3b28b0d08733cef0c0746aa8f464f
parent556750b5e9f277285a5f2efde61fcc1a89e3f08d
parent137bcf32002a195b1d527b19cb35fc25331c0985
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy

Conflicts:
policy/modules/kernel/devices.if
policy/modules/services/tcsd.fc
policy/modules/services/tcsd.if
policy/modules/services/tcsd.te
policy/modules/kernel/devices.if
policy/modules/services/tcsd.if
policy/modules/services/tcsd.te