]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit - policy/modules/services/networkmanager.te
Merge branch 'master' of http://oss.tresys.com/git/refpolicy
authorDan Walsh <dwalsh@redhat.com>
Mon, 20 Dec 2010 15:59:38 +0000 (10:59 -0500)
committerDan Walsh <dwalsh@redhat.com>
Mon, 20 Dec 2010 15:59:38 +0000 (10:59 -0500)
commit442a14feb09ce6cbed9f007c8176a11f39b3c52f
treed880bea08f1ffe5366f574fdea5cc7636480b000
parent685dcdded37836e91d7789e17caa3a29a7461b5b
parent7c4fbeba9482c8d23eb3e85c9261e549e973f365
Merge branch 'master' of http://oss.tresys.com/git/refpolicy

Conflicts:
policy/modules/system/init.if
policy/modules/apps/nsplugin.te
policy/modules/apps/qemu.te
policy/modules/apps/telepathy.te
policy/modules/services/ssh.te
policy/modules/services/virt.te
policy/modules/system/init.fc
policy/modules/system/init.if
policy/modules/system/init.te