summaryrefslogtreecommitdiff
path: root/source4/rpc_server/remote/README
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-20 21:35:10 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-20 21:35:10 +0200
commitd36edccc00452ff059a2e0ab5b7c4b68cb84eeb1 (patch)
treecbf55ec9969235754fee3b1264d4e775476ead75 /source4/rpc_server/remote/README
parent2c1b1255c2dc095013863a1d99b750e8506237fa (diff)
parentbc9bbda8b390a221d7b88fd6eb1b54efc8c91c6b (diff)
downloadsamba-d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1.tar.gz
samba-d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1.tar.bz2
samba-d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1.zip
Merge branch 'master' of git://git.samba.org/samba
Conflicts: source3/include/proto.h
Diffstat (limited to 'source4/rpc_server/remote/README')
0 files changed, 0 insertions, 0 deletions