2003-05-17 Havoc Pennington <hp@pobox.com>
authorHavoc Pennington <hp@redhat.com>
Sat, 17 May 2003 17:53:17 +0000 (17:53 +0000)
committerHavoc Pennington <hp@redhat.com>
Sat, 17 May 2003 17:53:17 +0000 (17:53 +0000)
commit8826fea41716e30987511b7739f9cffab7b814c4
treee95c881807a59b3f355384ce83cd5e8cef2a7c54
parent306eab3e3d998472ad111146a12b7697ea96c9b9
2003-05-17  Havoc Pennington  <hp@pobox.com>

* bus/config-parser.c (merge_included): merge in policies from
child configuration file.

* bus/policy.c (bus_policy_merge): function to merge two policies
together
ChangeLog
bus/config-parser.c
bus/policy.c
bus/policy.h
doc/TODO
glib/test-profile.c