diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:18:56 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:18:56 +0100 |
| commit | 256a81b3b12fceef1676d6114d9ff0568b645bca (patch) | |
| tree | 80776c7bb719a3f29a64305ff6ff5f9c2445a186 /target/tarch.lst | |
| parent | 8441e81773371fa37c9d7774436f357e97f4db99 (diff) | |
| parent | d7af52ccd4cab1fcffaec5706a8a6eba96502b89 (diff) | |
merge conflict
Diffstat (limited to 'target/tarch.lst')
| -rw-r--r-- | target/tarch.lst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/target/tarch.lst b/target/tarch.lst index 239c496df..e7251f8d2 100644 --- a/target/tarch.lst +++ b/target/tarch.lst @@ -1,5 +1,4 @@ arm -armeb m68k microblaze microblazeel |