diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-25 11:50:00 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-25 11:50:00 +0100 |
| commit | 1c5e713cceb6a4467540043df4087fe3f9f335d5 (patch) | |
| tree | 1c93f2ab8c76694a91d8e57394f77f4b872fec8b /source4/scripting/python/modules.c | |
| parent | 6c2d4f2806bae8072d61ba8795832d9a9e75573e (diff) | |
| parent | 5d55aa99e6488244208d7d84b188f92306c083f6 (diff) | |
| download | samba-1c5e713cceb6a4467540043df4087fe3f9f335d5.tar.gz samba-1c5e713cceb6a4467540043df4087fe3f9f335d5.tar.bz2 samba-1c5e713cceb6a4467540043df4087fe3f9f335d5.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
Conflicts:
source/scripting/python/samba/provision.py
(This used to be commit 64babbec22f165e34799d36ff4b76806d9fead50)
Diffstat (limited to 'source4/scripting/python/modules.c')
0 files changed, 0 insertions, 0 deletions