Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 20:44:31 +0000 (12:44 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 20:44:31 +0000 (12:44 -0800)
Conflicts:

source/Makefile.in

1  2 
source/Makefile.in

index e1f516f891050fdee4346e6f788ffe28cbe54868,b0b5c7cb1a46a031ec9af3d90a7488a1010787e1..42bea8bfbc8b4166ca7669db91c12fea2124996d
@@@ -2005,8 -1951,8 +2005,13 @@@ clean: delheader
  # 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: