Merge branch 'ports'

Conflicts:
	channels/serial/client/serial_tty.c
This commit is contained in:
Emmanuel Ledoux
2014-06-30 17:22:15 +02:00
committed by Emmanuel Ledoux
40 changed files with 8123 additions and 1382 deletions

3
.gitignore vendored
View File

@@ -122,3 +122,6 @@ default.log
*.txt.user
*.autosave
# etags
TAGS