]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'maste...
authorMiroslav Grepl <mgrepl@redhat.com>
Tue, 8 Mar 2011 12:03:39 +0000 (12:03 +0000)
committerMiroslav Grepl <mgrepl@redhat.com>
Tue, 8 Mar 2011 12:03:39 +0000 (12:03 +0000)
commitab9d1c17a2767dd1287b9c61f25b00ac7205ad8f
treeffc88756d1c0f7da7af3520af64a851d7c8a8802
parentad02e8bb9f1df441a66b1bb6ae0fa96214ad9a5d
parente6394e5f0e28d3415847f66b61a6447be5c4261f
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy

Conflicts:
policy/modules/admin/alsa.te
policy/modules/apps/cpufreqselector.if
policy/modules/kernel/devices.fc
policy/modules/kernel/devices.if
policy/modules/services/dbus.te
policy/modules/services/xserver.if
policy/modules/services/xserver.te
policy/modules/system/init.fc
22 files changed:
policy/modules/apps/cpufreqselector.te
policy/modules/kernel/devices.fc
policy/modules/kernel/devices.if
policy/modules/kernel/devices.te
policy/modules/kernel/files.fc
policy/modules/kernel/files.if
policy/modules/kernel/files.te
policy/modules/services/consolekit.if
policy/modules/services/consolekit.te
policy/modules/services/dbus.te
policy/modules/services/plymouthd.te
policy/modules/services/setroubleshoot.if
policy/modules/services/smartmon.te
policy/modules/services/xserver.if
policy/modules/services/xserver.te
policy/modules/system/authlogin.if
policy/modules/system/authlogin.te
policy/modules/system/init.fc
policy/modules/system/init.te
policy/modules/system/sysnetwork.fc
policy/modules/system/sysnetwork.if
policy/modules/system/sysnetwork.te