summaryrefslogtreecommitdiff
path: root/packaging/debian
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-03-03 10:50:53 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-03-03 10:50:53 +0100
commit7dd0cd26d32980d4edb9db5c77c98a2b112e24cb (patch)
tree025dad49b789c0e9f2eb03d87ec386295630b3f0 /packaging/debian
parent80e9b72e018fb7d7f2cd5ff383e4a533b4ccc705 (diff)
parent4d4a898742a0439d3f60c84194b02901412f4679 (diff)
downloadsamba-7dd0cd26d32980d4edb9db5c77c98a2b112e24cb.tar.gz
samba-7dd0cd26d32980d4edb9db5c77c98a2b112e24cb.tar.bz2
samba-7dd0cd26d32980d4edb9db5c77c98a2b112e24cb.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts: source/Makefile source/build/smb_build/makefile.pm source/librpc/config.mk (This used to be commit 3e02fcfd3fb6683f51417ba39f4ec177494eff3e)
Diffstat (limited to 'packaging/debian')
0 files changed, 0 insertions, 0 deletions