| commit | f453ff64fea3a6ba3eb2265e530805d6518c2b3e | |
| author | Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> | |
| Thu, 16 Jul 2009 19:35:35 +0000 (16 21:35 +0200) | ||
| committer | Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> | |
| Thu, 16 Jul 2009 19:35:35 +0000 (16 21:35 +0200) | ||
| tree | 884a2386c992a5ff9be151ce810a3a32f3dd9f50 | treesnapshot (tar.gz zip) |
| parent | f268e90d60b932eacfdd7e513169bc55294af04f | commitdiff |
| parent | d2c4881131e77c809011138b4ee64212bcf43993 | commitdiff |
Merge branch 'nestpart' into phcoder
Conflicts:
ChangeLog
Conflicts:
ChangeLog
| ChangeLog | diff1 | diff2 | blobhistory |
| conf/common.rmk | diff1 | diff2 | blobhistory |
| conf/i386-pc.rmk | diff1 | diff2 | blobhistory |
| kern/disk.c | diff1 | diff2 | blobhistory |
| loader/i386/bsd.c | diff1 | diff2 | blobhistory |