stevstrong 1c1c90ebe3 Merge remote-tracking branch 'refs/remotes/rogerclarkmelbourne/master' ... # Conflicts: # STM32F1/libraries/SPI/src/SPI.cpp # STM32F4/cores/maple/libmaple/HardwareSerial.cpp # STM32F4/cores/maple/libmaple/adc.h # STM32F4/cores/maple/libmaple/dmaF4.c # STM32F4/cores/maple/libmaple/dmaF4.h # STM32F4/cores/maple/libmaple/gpio.c # STM32F4/cores/maple/libmaple/gpio.h # STM32F4/cores/maple/libmaple/rcc.c # STM32F4/cores/maple/wirish_digital.cpp # STM32F4/cores/maple/wirish_time.h # STM32F4/libraries/SPI/src/SPI.cpp # STM32F4/platform.txt # STM32F4/system/libmaple/Arduino.h # STM32F4/variants/generic_f407v/generic_f407v.h # STM32F4/variants/generic_f407v/ld/common.inc # STM32F4/variants/generic_f407v/ld/jtag.ld # STM32F4/variants/generic_f407v/pin_map.c # STM32F4/variants/generic_f407v/variant.h # STM32F4/variants/generic_f407v/wirish/start.S		2017-07-03 20:09:45 +02:00
..
cores/maple	Merge remote-tracking branch 'refs/remotes/rogerclarkmelbourne/master'	2017-07-03 20:09:45 +02:00
libraries	Merge remote-tracking branch 'refs/remotes/rogerclarkmelbourne/master'	2017-07-03 20:09:45 +02:00
system/libmaple	push the generic_f4 branch to master	2017-05-13 10:27:33 +02:00
variants	added CCMRAM definitions	2017-06-20 21:03:18 +02:00
boards.txt	push the generic_f4 branch to master	2017-05-13 10:27:33 +02:00
platform.txt	Merge remote-tracking branch 'refs/remotes/rogerclarkmelbourne/master'	2017-07-03 20:09:45 +02:00