Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
|
|
|
|
(This used to be commit 6ad94d10f79f206fcdeb23cf71595e38c7a77855)
|
|
metze
(This used to be commit 66d8da17a4c3543e133452f9a87702a2a8fb609c)
|
|
metze
(This used to be commit 8bd30a7b4392642ef5184f959d801716d2db20b2)
|
|
(This used to be commit ba6394cb654f2a6683b5e97fad8e838d8e457e06)
|
|
(This used to be commit f2725f14918b7d1cd7664fe41ad0fc184aa794c8)
|
|
(This used to be commit 97b724417fc8110f7c591779b0c17bd072be304f)
|
|
(This used to be commit 3fb35fc03d5cfb48d0d4f51564ef76e99e74f81c)
|
|
(This used to be commit 21b4d017a2cccdaa6ab4ed32409f19c612293fd0)
|
|
and me.
(This used to be commit 6e29fbd5d06b02e2b0a55ae2994fce724aaa5bc5)
|
|
(This used to be commit 84d93728667921bf36a1b25c32bf8befa941a2c6)
|
|
files.
(This used to be commit ce440887316d3ae379551c136f6b640c573fd702)
|
|
(This used to be commit a95f2bf86a75729717542b401aa39bedd21be8d0)
|
|
(This used to be commit bd3f3e7c85f1a92638d69379782aa7bfcecd9e2f)
|
|
(This used to be commit a6b52119940a900fb0de3864b8bca94e2965cc24)
|
|
Conflicts:
source/build/smb_build/makefile.pm
(This used to be commit 57b57b1ff9a2ddf087fc6cceaf6c9afb4f8f0135)
|
|
(This used to be commit 5c961c0b41e0a41bd41705a103595af7405132a4)
|
|
(This used to be commit 4876c4efbbafb4e0afa3554cd9f748ab591a2927)
|
|
(This used to be commit d9770b651f61a0b70d6afa4610fadc7f199e1d98)
|
|
(This used to be commit 371afde9b04694beec4d9e5cb53634315aea86be)
|
|
(This used to be commit 33094329610097113c244ccd02606661a4c9e2e0)
|
|
smbpython).
(This used to be commit bb5c9fc64b6ad275abdd98a19f018953c9d79cbd)
|
|
Conflicts:
source/auth/config.mk
source/auth/gensec/config.mk
source/torture/smbtorture.c
(This used to be commit edfd02e59bba86b977bd60848f57a614691fff7a)
|
|
metze
(This used to be commit 6a1b7f56afa7475880f4eb5f0b669fd2b95a1d8f)
|
|
Andrew Bartlett
(This used to be commit 53ea233649d12d77233611e272cf5f470177571c)
|
|
Conflicts:
source/Makefile
source/auth/config.mk
source/auth/gensec/config.mk
source/build/m4/public.m4
source/build/make/python.mk
source/build/make/rules.mk
source/build/smb_build/header.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/dsdb/config.mk
source/dsdb/samdb/ldb_modules/config.mk
source/kdc/config.mk
source/lib/events/config.mk
source/lib/events/events.c
source/lib/ldb/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/util/config.mk
source/libcli/smb2/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/nbt_server/config.mk
source/ntptr/ntptr_base.c
source/ntvfs/posix/config.mk
source/ntvfs/sysdep/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/rpc_server/service_rpc.c
source/scripting/ejs/config.mk
source/scripting/python/config.mk
source/smb_server/config.mk
source/smbd/server.c
source/torture/config.mk
source/torture/smb2/config.mk
source/wrepl_server/config.mk
(This used to be commit 13bbd420681519894a4036729c43273912c9b402)
|
|
metze
(This used to be commit c7f34f41c3f9f0c3f75a618dfaf566706014a6b4)
|
|
(This used to be commit ecaa5bb83b5cf319718d15aff96152d70fa19f7f)
|
|
(This used to be commit ceda3312a98b069d0711f3cb33de3ae71e91ebaa)
|
|
Conflicts:
source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/build/smb_build/makefile.pm
source/heimdal_build/config.mk
source/lib/events/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/registry/config.mk
source/lib/socket_wrapper/config.mk
source/lib/tdb/config.mk
source/lib/tls/config.mk
source/lib/util/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/scripting/ejs/config.mk
source/smbd/process_model.mk
(This used to be commit 760378e0294dd0cd4523a83448328478632d7e3d)
|
|
(This used to be commit c165b34805aa6a82e579afda9f4244c0c68d52b4)
|
|
(This used to be commit bfb4d847005567da43e93987add1a7b171b7b192)
|
|
(This used to be commit 9caa9d85d1ab86bb575a5359d57919b801737a40)
|
|
(This used to be commit b5c293f05303460aceb8e29a1be68945fac9071a)
|
|
(This used to be commit f2e49744717eb46bbfafeea9e2eb412a38a142e7)
|
|
(This used to be commit 0ba8ac6a14c62ff9edfe9f0bf43b8a7406b85291)
|
|
(This used to be commit 45d252fd9b3df4f1221a23cece78b673a55dfc7c)
|
|
(This used to be commit 28aff6fafbb3d8796dd6aaac92500254cf50253e)
|
|
Conflicts:
source/build/smb_build/makefile.pm
(This used to be commit c45b97c4714dd0565949732394c9c1e8eedbb99a)
|
|
(This used to be commit 584a69acc5ccc0e9be0cb2687578c62bfa1e797d)
|
|
(This used to be commit 023025e4de119aa234f885aa6e5594660bd8f358)
|
|
(This used to be commit 673fb9c1855f9d61d4d311bcd5e3fea0210fe6ed)
|
|
(This used to be commit b0408abb08648c0155d8f5da5fb299b1acbc09b6)
|
|
(This used to be commit 803ebd6479ae388ae65de8de7fb88600452d47df)
|