Merge branch 'master' into fix_line_endings

eltang · Aug 27, 2016 · cff26bc · cff26bc
2 parents a5b1af4 + 36b6a96
commit cff26bc
Show file tree

Hide file tree

Showing 115 changed files with 3,664 additions and 3,306 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,4 +21,5 @@ addons:
     - gcc-arm-none-eabi
     - binutils-arm-none-eabi
     - libnewlib-arm-none-eabi
+    - diffutils
 after_success: bash util/travis_compiled_push.sh