diff options
| author | Jeremy Allison <jra@samba.org> | 2007-12-21 12:44:31 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-12-21 12:44:31 -0800 |
| commit | 03d3009986b3c82b55723e6db21e386a6bcedee8 (patch) | |
| tree | 020d92d31da9e37d2c6e132b6064c040ae63956a | |
| parent | 6f970837d025e56e1e033e7922d6d5d1539a97eb (diff) | |
| parent | 26e36db607caef8d7432d80322377c20911912ef (diff) | |
| download | samba-03d3009986b3c82b55723e6db21e386a6bcedee8.tar.gz samba-03d3009986b3c82b55723e6db21e386a6bcedee8.tar.bz2 samba-03d3009986b3c82b55723e6db21e386a6bcedee8.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
Conflicts:
source/Makefile.in
(This used to be commit 351df194a927371600824f4c03d8a24b95fbef64)
| -rw-r--r-- | source3/Makefile.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index e1f516f891..42bea8bfbc 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -2005,8 +2005,13 @@ clean: delheaders # afterwards. proto_exists: include/proto.h include/build_env.h \ winbindd/winbindd_proto.h web/swat_proto.h \ +<<<<<<< HEAD:source/Makefile.in libnet/libnet_proto.h \ client/client_proto.h utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c +======= + client/client_proto.h utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c \ + libnet/libnet_proto.h +>>>>>>> d6703f6d4e6a5256980188f6a840e6aaf07bc607:source/Makefile.in @touch proto_exists delheaders: |