mirror of
https://github.com/morgan9e/FreeRDP
synced 2026-04-14 00:14:11 +09:00
Merge branch 'ports'
Conflicts: channels/serial/client/serial_tty.c
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -122,3 +122,6 @@ default.log
|
||||
*.txt.user
|
||||
|
||||
*.autosave
|
||||
|
||||
# etags
|
||||
TAGS
|
||||
|
||||
Reference in New Issue
Block a user