| commit | 7d187111dbeea01d19de89780ede04cf5430ac7b | |
| author | Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> | |
| Sun, 19 Jul 2009 16:49:24 +0000 (19 18:49 +0200) | ||
| committer | Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> | |
| Sun, 19 Jul 2009 16:49:24 +0000 (19 18:49 +0200) | ||
| tree | 3059dce2edbcb9f7187ebeecbcd159335167f88a | treesnapshot (tar.gz zip) |
| parent | f0bee6cab2a17163d153ebcb28b0267225226dce | commitdiff |
| parent | 2085a36edb63e6711b1be0f9b9fca9b0f50b2270 | commitdiff |
Merge branch 'phcoder' into haiku
Conflicts:
util/i386/pc/grub-setup.c
Conflicts:
util/i386/pc/grub-setup.c