diff options
| author | JINMEI Tatuya <jinmei@isc.org> | 2011-03-11 23:13:24 +0100 |
|---|---|---|
| committer | JINMEI Tatuya <jinmei@isc.org> | 2011-03-11 23:13:24 +0100 |
| commit | 721a53160c15e8218f6798309befe940b9597ba0 (patch) | |
| tree | e6625f7a03860fcd7db8b4d869aefcdad069c2cb /src/lib/Makefile.am | |
| parent | [master] re-add return to make cppcheck happy (diff) | |
| parent | [trac626] Fix makefile (diff) | |
| download | kea-721a53160c15e8218f6798309befe940b9597ba0.tar.xz kea-721a53160c15e8218f6798309befe940b9597ba0.zip | |
[master] Merge branch 'trac626' with resolvoing conflicts in src/lib/Makefile.am.
Diffstat (limited to 'src/lib/Makefile.am')
| -rw-r--r-- | src/lib/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index f8e8172caa..8525b8da06 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 \ - asiolink nsas cache resolve testutils server_common +SUBDIRS = exceptions dns cc config python xfr bench log asiolink \ + nsas cache resolve testutils datasrc server_common |