modified:   armcmx/armcmx.h
	deleted:    armcmx/stm32f30x/SPIBus.cpp
	deleted:    armcmx/stm32f30x/SPIBus.h
	deleted:    armcmx/stm32f30x/Stream.cpp
	deleted:    armcmx/stm32f30x/Stream.h
	deleted:    armcmx/stm32f30x/USARTSerial.cpp
	deleted:    armcmx/stm32f30x/USARTSerial.h
	modified:   armcmx/stm32f30x/armcmx.c
	deleted:    armcmx/stm32f30x/armcmx.h
	deleted:    armcmx/stm32f30x/binary.h
	modified:   armcmx/stm32f30x/gpio.c
	modified:   armcmx/stm32f30x/gpio.h
	deleted:    armcmx/stm32f4/SPIBus.cpp
	deleted:    armcmx/stm32f4/SPIBus.h
	deleted:    armcmx/stm32f4/Stream.cpp
	deleted:    armcmx/stm32f4/Stream.h
	deleted:    armcmx/stm32f4/USARTSerial.cpp
	deleted:    armcmx/stm32f4/USARTSerial.h
	deleted:    armcmx/stm32f4/armcmx.h
	deleted:    armcmx/stm32f4/binary.h
	modified:   stm32_f3x_GPIO/MDK-ARM/GPIO_IOToggle.uvgui.sin
	modified:   stm32_f3x_GPIO/MDK-ARM/GPIO_IOToggle.uvopt
	modified:   stm32_f3x_GPIO/MDK-ARM/GPIO_IOToggle.uvproj
	modified:   stm32_f3x_GPIO/main.c
	armcmx/tools/Adafruit_GFX/
	armcmx/tools/TFTLCD/
	stm32_f3x_TFTLCD/
armcmx
gfx
maintenance
Merge remote-tracking branch 'origin/win@home'