Merge branch 'master' into oled-ssd1306

Conflicts: src/main/common/printf.c src/main/main.c src/main/sensors/initialisation.c src/main/target/NAZE/target.h
vobukay · Sep 15, 2014 · 876cf6b · 876cf6b
2 parents c1569d6 + d5cbb9a
commit 876cf6b
Show file tree

Hide file tree

Showing 24 changed files with 1,160 additions and 380 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,13 @@
+*.md text
+*.c text
+*.h text
+*.cc text
+*.S text
+*.s text
+*.hex -text
+*.elf -text
+*.ld text
+Makefile text
+*.bat eol=crlf
+*.txt text
+