diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-07-03 09:21:41 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-03 09:21:41 +0000 |
| commit | 0a5186fcb3682e80cb494ae758037a53da22a098 (patch) | |
| tree | 10ebb6b0ae94f734a6e972990a30c56cd359a48b /conf/machine/htcuniversal.conf | |
| parent | 05b2a4e780989cc4ed9a7f41e0628cb6be89d63f (diff) | |
linux-jlime-arm: fix mismerge
Diffstat (limited to 'conf/machine/htcuniversal.conf')
0 files changed, 0 insertions, 0 deletions