summaryrefslogtreecommitdiff
path: root/source4/libcli/composite/composite.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-03-25 10:29:35 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-03-25 10:29:35 +1100
commit2d08a03c50d065ed5175b37cb26b2794efde3c7b (patch)
tree5e2570cb23c1e29a1693d3ebfaafb952bee8af05 /source4/libcli/composite/composite.c
parent89870f2d9a7296b51d53934450ea5253a66145e5 (diff)
parent482f33077b965bab7f6ccb82cee03b66d70c57b7 (diff)
downloadsamba-2d08a03c50d065ed5175b37cb26b2794efde3c7b.tar.gz
samba-2d08a03c50d065ed5175b37cb26b2794efde3c7b.tar.bz2
samba-2d08a03c50d065ed5175b37cb26b2794efde3c7b.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 3903ef9168a18d34517c78536d34e147a9bc01cd)
Diffstat (limited to 'source4/libcli/composite/composite.c')
-rw-r--r--source4/libcli/composite/composite.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/libcli/composite/composite.c b/source4/libcli/composite/composite.c
index aab7487a42..26169e7838 100644
--- a/source4/libcli/composite/composite.c
+++ b/source4/libcli/composite/composite.c
@@ -1,6 +1,7 @@
/*
Unix SMB/CIFS implementation.
+ Copyright (C) Volker Lendecke 2005
Copyright (C) Andrew Tridgell 2005
This program is free software; you can redistribute it and/or modify