diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 18:04:16 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 18:04:16 +0200 |
| commit | d70efa57ceae1011a6a55d57d0152fd1bc2bb192 (patch) | |
| tree | 92ee7a3f33ea51f34a33fee094eaed651215a3d3 /lib/util/config.mk | |
| parent | 2f265feb174de1f743e8102ad34b3bdbcd2897cc (diff) | |
| parent | d805c714bb79a709716ec0373670283bfcd23c3c (diff) | |
| download | samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.gz samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.xz samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.zip | |
Merge branch 'master' of git://git.samba.org/samba
Conflicts:
lib/util/asn1_proto.h
Diffstat (limited to 'lib/util/config.mk')
| -rw-r--r-- | lib/util/config.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/util/config.mk b/lib/util/config.mk index f564efbe614..61e193b0c41 100644 --- a/lib/util/config.mk +++ b/lib/util/config.mk @@ -26,6 +26,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \ idtree.o \ become_daemon.o \ rbtree.o \ + talloc_stack.o \ params.o) PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \ |