Merge remote-tracking branch 'upstream/master' into a5200

2014-03-20 00:24:11 +01:00
parent 30b418c734 82f47cea4a
commit f266612697
542 changed files with 817 additions and 2121 deletions
--- a/src/common/target.c
+++ b/src/common/target.c
@@ -234,4 +234,3 @@ const char* GetTargetName (target_t Target)
    /* Return the array entry */
    return GetTargetProperties (Target)->Name;
 }
-