git.samba.org / abartlet / samba.git / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b775fe0 f2ebf07)
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 21:14:59 +0000 (13:14 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 21:14:59 +0000 (13:14 -0800)
commit9a2b54dfb695d36eafed3e2184bc6c1d34a408f9
treeb2a5aaf1e4a9491f6cd38bf4ff2fd0b35f5a902atree
parentb775fe0a170f9b6043aaea2c025fd70528c7e7e8commit | diff
parentf2ebf076a41cf96b0367049ee979d5b98052b3dbcommit | diff
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

Conflicts:

source/library-versions.in
(This used to be commit 11acca7d3884731491709dd09b7de2edc8bb5811)
source3/configure.in diff1 | diff2 | blob | history
source3/library-versions.in diff1 | diff2 | blob | history
Unnamed repository; edit this file to name it for gitweb.