diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-07 02:18:44 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-07 02:18:44 +0200 |
| commit | ee792cd4fe5062c8c488e1b43ab877bba6e073d2 (patch) | |
| tree | c14446ed347bec18fac580f293e77af0c45eb80c /target/qemu-x86/files | |
| parent | 52ee190f6bbbf0bf0c3d354f0370c409aed14506 (diff) | |
| parent | da28ccc6f848695609d32090142f1b4af0e27b17 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
target/alix2d/kernel.config
Diffstat (limited to 'target/qemu-x86/files')
0 files changed, 0 insertions, 0 deletions