]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8faa44 65fa559)
Merge remote-tracking branch 'maniacikarus/samba'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 31 Jan 2012 20:05:31 +0000 (21:05 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 31 Jan 2012 20:05:31 +0000 (21:05 +0100)
1  2 
samba/samba.nm patch | diff1 | diff2 | blob | history

diff --cc samba/samba.nm
Simple merge
Alex's tree of IPFire 3.x