Merge branch 'master' into smgmaster

Conflicts:
	build/modules.conf.in
	libs/esl/fs_cli.c
This commit is contained in:
Moises Silva
2011-12-17 17:25:36 -05:00
305 changed files with 15668 additions and 6219 deletions
+1 -1
View File
@@ -76,7 +76,7 @@ static HANDLE shutdown_event;
static void handle_SIGILL(int sig)
{
int32_t arg = 0;
if (sig);
if (sig) {};
/* send shutdown signal to the freeswitch core */
switch_core_session_ctl(SCSC_SHUTDOWN, &arg);
return;