| commit | 1075c763bd4a10ed2115ae68d29fae2e37eeb6e1 | |
| author | Thomas Nagy <tnagy2pow10@gmail.com> | |
| Mon, 30 Aug 2010 20:49:56 +0000 (30 22:49 +0200) | ||
| committer | Thomas Nagy <tnagy2pow10@gmail.com> | |
| Mon, 30 Aug 2010 20:49:56 +0000 (30 22:49 +0200) | ||
| tree | 19a50cb0aff20bc740ced4cbd9ad405e4768393b | treesnapshot (tar.gz zip) |
| parent | 2e225a150a729eaa3290daf032fa293d0084abb9 | commitdiff |
| parent | b4610cdb3b1d8e20bafd6d2d563360a59ef33ba3 | commitdiff |
Merge branch 'master' of git://git.samba.org/samba
Conflicts:
buildtools/wafsamba/wscript
Conflicts:
buildtools/wafsamba/wscript
| source3/wscript_build | diff1 | diff2 | blobhistory |