[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-102-g9bd0cf8

[Jelmer Vernooij]

The branch, master has been updated
       via  9bd0cf8d60b9bbaafa20f33bb1baf222620fb0b0 (commit)
      from  99b288156f021db7bb771f3a5bf78def61d699f2 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9bd0cf8d60b9bbaafa20f33bb1baf222620fb0b0
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 1 18:02:24 2009 +0100

    Keep using Samba3's charset.h for now.

-----------------------------------------------------------------------

Summary of changes:
 source3/include/includes.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7f8c408..523a11e 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -594,7 +594,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "trans2.h"
 #include "../libcli/util/error.h"
 #include "ntioctl.h"
-#include "../lib/util/charset/charset.h"
+#include "charset.h"
 #include "dynconfig.h"
 #include "util_getent.h"
 #include "debugparse.h"


-- 
Samba Shared Repository