summaryrefslogtreecommitdiffstats
path: root/src/lib/resolve
diff options
context:
space:
mode:
authorMichal 'vorner' Vaner <michal.vaner@nic.cz>2011-06-23 15:30:49 +0200
committerMichal 'vorner' Vaner <michal.vaner@nic.cz>2011-06-23 15:30:49 +0200
commitfef88019d325474471a353304499e7919023912e (patch)
treea9e955388d66329656c4da306628b1d640159848 /src/lib/resolve
parentMerge branch 'master' into trac1008 (diff)
parent[trac769] Little bit of renaming (diff)
downloadkea-fef88019d325474471a353304499e7919023912e.tar.xz
kea-fef88019d325474471a353304499e7919023912e.zip
Merge branch 'work/dnsacl'
Conflicts: src/lib/acl/tests/Makefile.am
Diffstat (limited to 'src/lib/resolve')
0 files changed, 0 insertions, 0 deletions