git.samba.org / sfrench / samba-autobuild / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b8310f4 d6703f6)
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 20:44:31 +0000 (12:44 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 20:44:31 +0000 (12:44 -0800)
commit351df194a927371600824f4c03d8a24b95fbef64
treec438069a2b429625672b583fbf95993124e83a1ftree
parentb8310f427277640c7b2526d0c5cd84deecfd3e99commit | diff
parentd6703f6d4e6a5256980188f6a840e6aaf07bc607commit | diff
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

Conflicts:

source/Makefile.in
source/Makefile.in diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.