diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-04-15 16:56:15 +0200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-15 16:56:15 +0200 |
commit | dfedfae1cd1c1af54609fd56dafe8eb026f9382c (patch) | |
tree | 7a07bcd46bf711f5ed5ed5d2dd5774f22bf5df94 /swat/desktop | |
parent | cb5873f36d5f67b51afd9327df114ff7c1b529d0 (diff) | |
parent | 7bb2ebb884c35676a6cf03efe6ecc15b3e232a43 (diff) | |
download | samba-dfedfae1cd1c1af54609fd56dafe8eb026f9382c.tar.gz samba-dfedfae1cd1c1af54609fd56dafe8eb026f9382c.tar.bz2 samba-dfedfae1cd1c1af54609fd56dafe8eb026f9382c.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 66327b8bd8dbde140b93f000a81ba13e743f27b0)
Diffstat (limited to 'swat/desktop')
0 files changed, 0 insertions, 0 deletions