]> 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: 442a14f 3eecd32)
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorDan Walsh <dwalsh@redhat.com>
Mon, 20 Dec 2010 16:43:31 +0000 (11:43 -0500)
committerDan Walsh <dwalsh@redhat.com>
Mon, 20 Dec 2010 16:43:31 +0000 (11:43 -0500)
1  2 
policy/modules/apps/telepathy.te patch | diff1 | diff2 | blob | history

diff --cc policy/modules/apps/telepathy.te
Simple merge
The IPFire selinux policy.