Fergus Noble ae44add1b6 Merge branch 'stm32fx' of https://github.com/doceme/libopenstm32 into stm32f2
Conflicts:
	Makefile
	examples/stm32/lisa-m/fancyblink/fancyblink.ld
	examples/stm32/lisa-m/usb_hid/usbhid.ld
	examples/stm32/mb525/fancyblink/fancyblink.ld
	examples/stm32/obldc/usart_irq/usart_irq.ld
	examples/stm32/other/usb_dfu/usbdfu.c
	examples/stm32/stm32-h103/fancyblink/fancyblink.ld
	examples/stm32/stm32-h103/usart_irq/usart_irq.ld
	examples/stm32/stm32-h103/usb_dfu/usbdfu.c
	examples/stm32/stm32-h103/usb_hid/usbhid.ld
	examples/stm32f1/Makefile.include
	examples/stm32f1/lisa-m/fancyblink/fancyblink.ld
	examples/stm32f1/lisa-m/usb_hid/usbhid.ld
	examples/stm32f1/mb525/fancyblink/fancyblink.ld
	examples/stm32f1/obldc/usart_irq/usart_irq.ld
	examples/stm32f1/other/usb_dfu/usbdfu.c
	examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld
	examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld
	examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c
	examples/stm32f1/stm32-h103/usb_hid/usbhid.ld
	examples/stm32f2/jobygps/usart_printf/usart_printf.ld
	lib/lm3s/Makefile
	lib/lpc13xx/Makefile
	lib/stm32f1/Makefile
2011-10-13 00:11:32 -07:00
..
2011-10-12 22:20:22 -04:00
2011-10-12 22:20:22 -04:00