Waldemar Brodkorb
2735fdf973
resolve merge conflict
|
11 years ago | |
|---|---|---|
| .. | ||
| kernel | 11 years ago | |
| sys-available | 11 years ago | |
| Config.in | 11 years ago | |
| Makefile | 11 years ago | |
| target.mk | 11 years ago | |
| uclibc.config | 11 years ago | |
|
Waldemar Brodkorb
2735fdf973
resolve merge conflict
|
11 years ago | |
|---|---|---|
| .. | ||
| kernel | 11 years ago | |
| sys-available | 11 years ago | |
| Config.in | 11 years ago | |
| Makefile | 11 years ago | |
| target.mk | 11 years ago | |
| uclibc.config | 11 years ago | |