git.samba.org / tridge / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f04bef 9e64ed0)
Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 14:36:53 +0000 (15:36 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 14:36:53 +0000 (15:36 +0100)
1  2 
.gitignore patch | diff1 | diff2 | blob | history
source3/Makefile.in patch | diff1 | diff2 | blob | history

diff --cc .gitignore
Simple merge
diff --cc source3/Makefile.in
Simple merge
Work in progress branches