summaryrefslogtreecommitdiff
path: root/packaging4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-24 18:38:45 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-24 18:38:45 +0200
commitedeb20b92128f1859d2d8ecee820846ac5799ed5 (patch)
treeb7c66bf4da6bbe5628fc25def555448d1789b5b1 /packaging4
parentda01822671b3a553fd805315df7322b8225cfe95 (diff)
parentd2062ab74f7684f8b6975a7415fac23389851278 (diff)
downloadsamba-edeb20b92128f1859d2d8ecee820846ac5799ed5.tar.gz
samba-edeb20b92128f1859d2d8ecee820846ac5799ed5.tar.bz2
samba-edeb20b92128f1859d2d8ecee820846ac5799ed5.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4
Conflicts: source3/include/includes.h
Diffstat (limited to 'packaging4')
0 files changed, 0 insertions, 0 deletions