]> git.ipfire.org Git - people/stevee/selinux-policy.git/commitdiff
projects / people / stevee / selinux-policy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 732e5bc 911d3ea)
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorMiroslav Grepl <mgrepl@redhat.com>
Thu, 10 Nov 2011 07:01:58 +0000 (07:01 +0000)
committerMiroslav Grepl <mgrepl@redhat.com>
Thu, 10 Nov 2011 07:01:58 +0000 (07:01 +0000)
Conflicts:
policy/modules/services/vhostmd.te

1  2 
policy/modules/services/vhostmd.te patch | diff1 | diff2 | blob | history

diff --cc policy/modules/services/vhostmd.te
Simple merge
The IPFire selinux policy.