| commit | 7351d4f7012b12d29ad8436d48b3265c076a8692 | |
| author | Tomas 'ZeXx86' Jedrzejek <zexx86@gmail.com> | |
| Thu, 31 Dec 2009 16:42:19 +0000 (31 17:42 +0100) | ||
| committer | Tomas 'ZeXx86' Jedrzejek <zexx86@gmail.com> | |
| Thu, 31 Dec 2009 16:42:19 +0000 (31 17:42 +0100) | ||
| tree | 0e1cdf0e00dd215479d7685e8fa2c9129ef4d656 | treesnapshot (tar.gz zip) |
| parent | 09e5610463fecfaa9ed6c621eb05b26afb044402 | commitdiff |
| parent | ff095601bf05fdd9bf5aecaac6eebc0c5a3604fe | commitdiff |
Merge commit 'origin/dhcp-client'
Conflicts:
kernel/core/net/packet.c
kernel/include/net/if.h
kernel/kernel.mak
Conflicts:
kernel/core/net/packet.c
kernel/include/net/if.h
kernel/kernel.mak
| kernel/core/commands.c | diff1 | diff2 | blobhistory |
| kernel/core/net/packet.c | diff1 | diff2 | blobhistory |
| kernel/include/net/if.h | diff1 | diff2 | blobhistory |