[SCM] Samba Shared Repository - branch master updated - 1c07c30d31b4b588b59b845bdb5f85a0ba19f762

[Jelmer Vernooij]

The branch, master has been updated
       via  1c07c30d31b4b588b59b845bdb5f85a0ba19f762 (commit)
       via  ab55ecb881bfabe427ecb874d2dff2b5c2a7e84a (commit)
      from  9ea794417e8bad3da4236f4071a0d8a23612ac8a (commit)

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


- Log -----------------------------------------------------------------
commit 1c07c30d31b4b588b59b845bdb5f85a0ba19f762
Merge: ab55ecb881bfabe427ecb874d2dff2b5c2a7e84a 
9ea794417e8bad3da4236f4071a0d8a23612ac8a
Author: Jelmer Vernooij <jelmer@xxxxxxxxx>
Date:   Tue Nov 18 01:36:02 2008 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit ab55ecb881bfabe427ecb874d2dff2b5c2a7e84a
Author: Jelmer Vernooij <jelmer@xxxxxxxxx>
Date:   Tue Nov 18 01:35:10 2008 +0100

    Explicitly include samba4 includes.h to fix the build.

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

Summary of changes:
 lib/torture/torture.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/torture/torture.c b/lib/torture/torture.c
index 6b2a5b1..0ef5f61 100644
--- a/lib/torture/torture.c
+++ b/lib/torture/torture.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "source4/include/includes.h"
 #include "../torture/torture.h"
 #include "../lib/util/dlinklist.h"
 #include "param/param.h"


-- 
Samba Shared Repository