| commit | 614d1e31175de7a2defd7002722af8cd43bee701 | |
| author | Simo Sorce <idra@samba.org> | |
| Thu, 22 Jan 2004 10:57:16 +0000 (22 10:57 +0000) | ||
| committer | Simo Sorce <idra@samba.org> | |
| Thu, 22 Jan 2004 10:57:16 +0000 (22 10:57 +0000) | ||
| tree | 6664de0effa3aa59c3d4ce04098ddce7f0cc91c8 | treesnapshot (tar.gz zip) |
| parent | 77f2465c10db5688a361409a75a20a75bd2e9c51 | commitdiff |
sorry for the conflict markers committed in by mistake :-(
(This used to be commit c5634e0b713e594a32522df7a76c36639f772ed5)
(This used to be commit c5634e0b713e594a32522df7a76c36639f772ed5)
| source3/passdb/pdb_gums.c | diffblobblamehistory |