kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 09:36:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into smgmaster

Browse Source 
Conflicts:
	src/switch_console.c
This commit is contained in:
Moises Silva
2011-05-22 17:53:14 -04:00
parent 9d964b5767 9e3c258fe2
commit 950e936111
296 changed files with 11586 additions and 7566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/esl/fs_cli.c
View File

@@ -840,9 +840,9 @@ static const char *basic_gets(int *cnt)
}
Sleep(20);
}
#endif
return command_buf;
#endif
}
#endif