Merge remote-tracking branch 'refs/remotes/origin/Black_F4_variant'

stevstrong · stevstrong · commit 8d93d4beaa05 · 2017-07-03T20:54:22.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ other/maple-bootloader/*~
 tools/src/stm32flash_serial/src/parsers/parsers.a
 *.bak
 *.1
+STM32F4/cores/maple/libmaple/adc.h
