diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 21:10:41 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 21:10:41 +0200 |
| commit | e3a615172e43347f31ad260f0f7ce28a39265257 (patch) | |
| tree | 8e87c7ead0b211ccd9990fb6cb8173f3386f471a /source4/configure.ac | |
| parent | dc114f8c5acbcffe2f7114083f3e058f17fb4fa2 (diff) | |
| parent | 78f804c497249cc807d8f2d7ac914288b3739c49 (diff) | |
| download | samba-e3a615172e43347f31ad260f0f7ce28a39265257.tar.gz samba-e3a615172e43347f31ad260f0f7ce28a39265257.tar.bz2 samba-e3a615172e43347f31ad260f0f7ce28a39265257.zip | |
Merge branch 'v4-0-test' of /home/jelmer/samba34.git/samba4 into v4-0-test
Conflicts:
source/build/smb_build/makefile.pm
(This used to be commit 57b57b1ff9a2ddf087fc6cceaf6c9afb4f8f0135)
Diffstat (limited to 'source4/configure.ac')
0 files changed, 0 insertions, 0 deletions