]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit - policy/modules/apps/sambagui.te
Merge branches 'master', 'master' and 'master' of http://oss.tresys.com/git/refpolicy
authorDan Walsh <dwalsh@redhat.com>
Fri, 3 Sep 2010 21:16:08 +0000 (17:16 -0400)
committerDan Walsh <dwalsh@redhat.com>
Fri, 3 Sep 2010 21:16:08 +0000 (17:16 -0400)
commitcdda8feee002771a0fec76c5588aedec59edf92e
tree43c90c3274b6a88f037978e6e36e0c6d5c750c62
parentef98a37444a2b4eec9efeef341b93ef6b9afe12e
parent28d96f0e3974f203b0bd1567a3d15c3113df2970
Merge branches 'master', 'master' and 'master' of http://oss.tresys.com/git/refpolicy

Conflicts:
policy/modules/admin/alsa.fc
policy/modules/admin/alsa.if
policy/modules/kernel/filesystem.fc
policy/modules/admin/alsa.fc
policy/modules/admin/alsa.if
policy/modules/kernel/filesystem.fc
policy/modules/kernel/filesystem.if
policy/modules/kernel/filesystem.te