automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-09-28 18:01:52 +00:00
parent 93efe68235
commit ae1a27ae61
14 changed files with 35 additions and 40 deletions

View File

@@ -2062,7 +2062,7 @@ static int load_config(void)
char *exten, *party=NULL, *app=NULL, *app_args=NULL;
if (!tmp_val) {
ast_log(LOG_ERROR, "res_features: strdup failed");
ast_log(LOG_ERROR, "res_features: strdup failed\n");
continue;
}