diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 11:53:26 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 11:53:26 +0200 |
| commit | 4a54d9dd804bc3b64703ba04060ec8c48a8c9811 (patch) | |
| tree | 948f1b2bead3d128603ad5a34609205db61da3aa /target/arch.lst | |
| parent | e61aad237ecb819635bb7550dbbf66f2b8817b50 (diff) | |
| parent | 40c2b2f6a83e9cca14567e855fc75a8d1ef78f28 (diff) | |
resolve conflict
Diffstat (limited to 'target/arch.lst')
| -rw-r--r-- | target/arch.lst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target/arch.lst b/target/arch.lst index a5c2da7ec..b4eca2828 100644 --- a/target/arch.lst +++ b/target/arch.lst @@ -5,5 +5,6 @@ ppc ppc64 sparc sparc64 +sh x86 x86_64 |