git.samba.org / ira / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7106cd9 a69a2ae)
Merge branch 'master' of ssh://git.samba.org/data/git/samba into singlelib
authorJelmer Vernooij <jelmer@samba.org>
Wed, 17 Sep 2008 12:34:54 +0000 (14:34 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 17 Sep 2008 12:34:54 +0000 (14:34 +0200)
1  2 
source3/Makefile.in patch | diff1 | diff2 | blob | history
source3/configure.in patch | diff1 | diff2 | blob | history

diff --cc source3/Makefile.in
Simple merge
diff --cc source3/configure.in
Simple merge
Unnamed repository; edit this file 'description' to name the repository.