Emmanuel Ledoux 9fc225ac5d Merge branch 'ports' ... Conflicts: channels/serial/client/serial_tty.c		2014-06-30 17:22:15 +02:00
..
addin.c	Fixed coverity issue 1047619	2013-09-05 12:14:31 +02:00
CMakeLists.txt	cmake: mark required libraries for export	2014-04-23 10:16:02 +02:00
settings.c	Merge branch 'ports'	2014-06-30 17:22:15 +02:00