Merge branch 'master' into debian
37dcc11d741c
Actions

Authored by Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org> on May 20 2013, 16:40.

Description

Merge branch 'master' into debian

Committed

Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>

May 20 2013, 16:40

Pushed

tuleu

May 7 2018, 15:04

Parents

Branches

Unknown

Tags

Unknown

Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org> committed R6620:37dcc11d741c: Merge branch 'master' into debian (authored by Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>).May 20 2013, 16:40

Commit	Author	Details	Committed
8169effda030	Alexandre Tuleu	Releases 0.4.0~rc1	May 20 2013
241d73c28403	Alexandre Tuleu	Removes duplicate typedef	May 20 2013
d9b45418ca57	Alexandre Tuleu	Implements monitoring of the bus	May 20 2013
51cebf6ee6a7	Alexandre Tuleu	Adds sbcpd_stats structure.	May 20 2013
006a1ec4e727	Alexandre Tuleu	Updates copyright statements	May 20 2013
7b870d2f3288	Alexandre Tuleu	Disambiguate tags and type name	May 20 2013

				Path
	M			CMakeLists.txt
	M			sbcpd/CMakeLists.txt
	M			sbcpd/bus.c
	M			sbcpd/bus.h
	M			sbcpd/bus.ih
	M			sbcpd/common.h
	P			sbcpd/error.c Copied to sbcpd/private/stats.h
	M			sbcpd/error.h
	M			sbcpd/ftdi/ft2232h.c
	M			sbcpd/ftdi/ft2232h.h
	P			sbcpd/private/stats.h Copied from sbcpd/error.c
	M			sbcpd/private/transfer_manager.c
	M			sbcpd/private/transfer_manager.h
	M			sbcpd/sbcp.h
	M			sbcpd/sbcpd.c
	P			sbcpd/sbcpd.h Copied to multiple locations: sbcpd/si/linux_serial.ih sbcpd/test/DoubleLinkedListUTest.h
	M			sbcpd/settings.c
	M			sbcpd/settings.h
	M			sbcpd/si/ft2232h.c
	M			sbcpd/si/ft2232h.h
	P			sbcpd/si/ftdi.h Copied to sbcpd/test/main.cpp
	M			sbcpd/si/linux_serial.c
	M			sbcpd/si/linux_serial.h
	P			sbcpd/si/linux_serial.ih Copied from sbcpd/sbcpd.h
	M			sbcpd/si/serial_interface.h
	A			sbcpd/stats.c
	A			sbcpd/stats.h
	M			sbcpd/test/BusUTest.cpp
	M			sbcpd/test/BusUTest.h
	M			sbcpd/test/DoubleLinkedListUTest.cpp
	P			sbcpd/test/DoubleLinkedListUTest.h Copied from sbcpd/sbcpd.h
	M			sbcpd/test/FakeSerialInterface.cpp
	M			sbcpd/test/FakeSerialInterface.h
	P			sbcpd/test/main.cpp Copied from sbcpd/si/ftdi.h
	M			sbcpd/transfer.c
	M			sbcpd/transfer.h