diff options
author | Jeremy Allison <jra@samba.org> | 2001-11-15 21:50:29 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2001-11-15 21:50:29 +0000 |
commit | 2c6f0fa5101f6d2d46f799e3060930d2eb1f53f8 (patch) | |
tree | 88cb64d545e1ec92c8646bce0d0290a52c011417 /source3/Makefile.in | |
parent | 186726b7f85f3e84c9ad900262da93471570498e (diff) | |
download | samba-2c6f0fa5101f6d2d46f799e3060930d2eb1f53f8.tar.gz samba-2c6f0fa5101f6d2d46f799e3060930d2eb1f53f8.tar.bz2 samba-2c6f0fa5101f6d2d46f799e3060930d2eb1f53f8.zip |
Tidyups in the merge process.
Jeremy.
(This used to be commit a7b45bfb713adaaad0dca3dc13139ee5a909a383)
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r-- | source3/Makefile.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index bf54be896a..d91cc1c676 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -158,8 +158,7 @@ RPC_PARSE_OBJ = rpc_parse/parse_lsa.o rpc_parse/parse_net.o \ rpc_parse/parse_reg.o rpc_parse/parse_rpc.o \ rpc_parse/parse_samr.o rpc_parse/parse_srv.o \ rpc_parse/parse_wks.o \ - rpc_parse/parse_spoolss.o rpc_parse/parse_dfs.o \ - rpc_parse/parse_creds.o + rpc_parse/parse_spoolss.o rpc_parse/parse_dfs.o RPC_CLIENT_OBJ = rpc_client/cli_netlogon.o rpc_client/cli_pipe.o \ |