]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit - policy/modules/apps/sambagui.te
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'maste...
authorDan Walsh <dwalsh@redhat.com>
Fri, 5 Nov 2010 16:12:37 +0000 (12:12 -0400)
committerDan Walsh <dwalsh@redhat.com>
Fri, 5 Nov 2010 16:12:37 +0000 (12:12 -0400)
commitfe2529147a14ca50879f9fde1269652cfd6ef73f
treec4c3d5e2634cdeb0871ba80a23e873162374c7f0
parent9076b0bcc187250553f6b701337ddb76f319b296
parent47ecd96afa140be11b13b197b0718800076370a8
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy

Conflicts:
policy/modules/kernel/corecommands.fc
policy/modules/roles/sysadm.te
policy/modules/roles/unprivuser.te
policy/modules/services/bitlbee.te
policy/modules/services/oident.te
policy/modules/services/tor.te
policy/modules/system/kdump.if
policy/modules/system/kdump.te
15 files changed:
policy/modules/apps/wireshark.te
policy/modules/kernel/corecommands.fc
policy/modules/kernel/corecommands.if
policy/modules/kernel/selinux.if
policy/modules/roles/auditadm.te
policy/modules/roles/secadm.te
policy/modules/roles/staff.te
policy/modules/roles/sysadm.te
policy/modules/roles/unprivuser.te
policy/modules/services/apcupsd.te
policy/modules/services/avahi.if
policy/modules/services/bitlbee.te
policy/modules/services/oident.te
policy/modules/services/tor.te
policy/modules/system/setrans.te