Emmanuel Ledoux 9fc225ac5d Merge branch 'ports' ... Conflicts: channels/serial/client/serial_tty.c		2014-06-30 17:22:15 +02:00
..
client	Merge branch 'ports'	2014-06-30 17:22:15 +02:00
ChannelOptions.cmake	channels: cmake cleanup, USB redirection refactoring	2012-11-20 19:34:52 -05:00
CMakeLists.txt	channels: refactoring of channels cmake scripts with macros	2012-10-17 02:14:19 -04:00