[libopencm3-commits] libopencm3 branch, master, updated. 03807ddd6c3cef98054a9ef771decac6b7468bc4

[Piotr Esden-T. <es...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libopencm3".

The branch, master has been updated
       via  03807ddd6c3cef98054a9ef771decac6b7468bc4 (commit)
       via  02ea612142fb93d43698b10502a05f6ccd2ec781 (commit)
       via  5604182467119ac4a90175b050da64f1de9be146 (commit)
       via  5ad8f26ede984cbf820707a11e1ddbc8ea52d06b (commit)
       via  3aab6220d83d5b9fcd318e9d87225ff405cad783 (commit)
      from  9af50d6e5cf0681b276438acfd92c9975290f1b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 03807ddd6c3cef98054a9ef771decac6b7468bc4
Merge: 02ea612 5604182
Author: Piotr Esden-Tempski <pi...@es...>
Date:   Mon Sep 10 12:29:37 2012 -0700

    Merge pull request #27 "added a make target stlink-flash to use the stlink on the stm32f4-disovery"
    
    Merge remote-tracking branch 'twaldecker/stlink'

commit 02ea612142fb93d43698b10502a05f6ccd2ec781
Merge: 9af50d6 5ad8f26
Author: Piotr Esden-Tempski <pi...@es...>
Date:   Mon Sep 10 12:21:21 2012 -0700

    Merge pull request #25 "Add support for C++ and fix some comments typo"
    
    Merge remote-tracking branch 'schodet/master'
    
    Conflicts:
    	include/libopencm3/stm32/f1/adc.h

commit 5604182467119ac4a90175b050da64f1de9be146
Author: Thomas Waldecker <tho...@go...>
Date:   Thu Sep 6 11:33:01 2012 +0200

    added a make target stlink-flash to use the stlink on the stm32f4-disovery

commit 5ad8f26ede984cbf820707a11e1ddbc8ea52d06b
Author: Nicolas Schodet <ni...@ni...>
Date:   Sun Sep 2 17:15:13 2012 +0200

    Fix comments typo

commit 3aab6220d83d5b9fcd318e9d87225ff405cad783
Author: Nicolas Schodet <ni...@ni...>
Date:   Sun Sep 2 17:12:58 2012 +0200

    Add C linkage declaration for C++ usage

-----------------------------------------------------------------------

Summary of changes:
 examples/stm32/f4/Makefile.include   |    6 ++++++
 include/libopencm3/cm3/common.h      |   10 ++++++++++
 include/libopencm3/lm3s/gpio.h       |    4 ++++
 include/libopencm3/lpc17xx/gpio.h    |    4 ++++
 include/libopencm3/lpc43xx/gpio.h    |    4 ++++
 include/libopencm3/lpc43xx/i2c.h     |    6 +++++-
 include/libopencm3/lpc43xx/nvic.h    |    4 ++++
 include/libopencm3/lpc43xx/scu.h     |    4 ++++
 include/libopencm3/lpc43xx/ssp.h     |    4 ++++
 include/libopencm3/lpc43xx/systick.h |    4 ++++
 include/libopencm3/stm32/can.h       |    4 ++++
 include/libopencm3/stm32/crc.h       |    4 ++++
 include/libopencm3/stm32/dac.h       |    4 ++++
 include/libopencm3/stm32/exti.h      |    4 ++++
 include/libopencm3/stm32/f1/adc.h    |    5 +++++
 include/libopencm3/stm32/f1/desig.h  |    4 ++++
 include/libopencm3/stm32/f1/dma.h    |    4 ++++
 include/libopencm3/stm32/f1/flash.h  |    4 ++++
 include/libopencm3/stm32/f1/gpio.h   |    4 ++++
 include/libopencm3/stm32/f1/rcc.h    |    4 ++++
 include/libopencm3/stm32/f1/rtc.h    |    4 ++++
 include/libopencm3/stm32/f1/scb.h    |    5 +++++
 include/libopencm3/stm32/f2/flash.h  |    4 ++++
 include/libopencm3/stm32/f2/gpio.h   |    4 ++++
 include/libopencm3/stm32/f2/rcc.h    |    4 ++++
 include/libopencm3/stm32/f2/scb.h    |    5 +++++
 include/libopencm3/stm32/f2/timer.h  |    4 ++++
 include/libopencm3/stm32/f4/flash.h  |    4 ++++
 include/libopencm3/stm32/f4/gpio.h   |    4 ++++
 include/libopencm3/stm32/f4/pwr.h    |    4 ++++
 include/libopencm3/stm32/f4/rcc.h    |    4 ++++
 include/libopencm3/stm32/f4/scb.h    |    5 +++++
 include/libopencm3/stm32/f4/timer.h  |    4 ++++
 include/libopencm3/stm32/i2c.h       |    4 ++++
 include/libopencm3/stm32/iwdg.h      |    4 ++++
 include/libopencm3/stm32/nvic.h      |    4 ++++
 include/libopencm3/stm32/pwr.h       |    4 ++++
 include/libopencm3/stm32/sdio.h      |    2 +-
 include/libopencm3/stm32/spi.h       |    4 ++++
 include/libopencm3/stm32/systick.h   |    4 ++++
 include/libopencm3/stm32/timer.h     |    5 +++++
 include/libopencm3/stm32/usart.h     |    4 ++++
 include/libopencm3/usb/usbd.h        |    4 ++++
 43 files changed, 183 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
libopencm3