diff options
| author | Jelte Jansen <jelte@isc.org> | 2011-03-11 16:11:46 +0100 |
|---|---|---|
| committer | Jelte Jansen <jelte@isc.org> | 2011-03-11 16:11:46 +0100 |
| commit | 76022a7e9f3ff339f0f9f10049aa85e5784d72c5 (patch) | |
| tree | 662a53aee0323c33ada97bba0ce55739806708b8 /src/lib/Makefile.am | |
| parent | [master] Changelog (diff) | |
| parent | [trac495] address review comments (diff) | |
| download | kea-76022a7e9f3ff339f0f9f10049aa85e5784d72c5.tar.xz kea-76022a7e9f3ff339f0f9f10049aa85e5784d72c5.zip | |
[master] Merge branch 'trac495'
Conflicts:
src/lib/Makefile.am
src/lib/asiolink/Makefile.am
src/lib/asiolink/tcp_socket.h
src/lib/asiolink/tests/Makefile.am
src/lib/nsas/asiolink.h
src/lib/resolve/recursive_query.cc
Diffstat (limited to 'src/lib/Makefile.am')
| -rw-r--r-- | src/lib/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 27d9b8bc4b..f8e8172caa 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,2 +1,2 @@ SUBDIRS = exceptions dns cc config datasrc python xfr bench log \ - resolve nsas cache asiolink testutils server_common + asiolink nsas cache resolve testutils server_common |