mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-30 15:14:17 +00:00
Merge branch 'master' into smgmaster
Conflicts: src/switch_console.c
This commit is contained in:
commit
950e936111
296 files changed
+11586
-7566
No files matched your search
+1
-1
@@ -840,9 +840,9 @@ static const char *basic_gets(int *cnt)
|
||||
}
|
||||
Sleep(20);
|
||||
}
|
||||
#endif
|
||||
|
||||
return command_buf;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in new issue
Block a user