Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
authorJelmer Vernooij <jelmer@samba.org>
Thu, 18 Sep 2008 18:29:05 +0000 (20:29 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 18 Sep 2008 18:29:05 +0000 (20:29 +0200)
Conflicts:
source4/main.mk

1  2 
pidl/pidl
source4/Makefile
source4/configure.ac
source4/main.mk
source4/selftest/samba4_tests.sh

diff --cc pidl/pidl
Simple merge
Simple merge
Simple merge
diff --cc source4/main.mk
@@@ -16,8 -16,9 +16,8 @@@ mkinclude lib/registry/config.m
  mkinclude lib/messaging/config.mk
  mkinclude lib/events/config.mk
  mkinclude lib/cmdline/config.mk
- mkinclude lib/socket_wrapper/config.mk
- mkinclude lib/nss_wrapper/config.mk
+ mkinclude ../lib/socket_wrapper/config.mk
+ mkinclude ../lib/nss_wrapper/config.mk
 -mkinclude lib/appweb/config.mk
  mkinclude lib/stream/config.mk
  mkinclude lib/util/config.mk
  mkinclude lib/tdr/config.mk
Simple merge