From f46c403e345275f9b49f46b2bccb0a2025a7f38c Mon Sep 17 00:00:00 2001 From: murf Date: Thu, 12 Jun 2008 15:01:34 +0000 Subject: Merged revisions 122128 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r122128 | murf | 2008-06-12 08:56:26 -0600 (Thu, 12 Jun 2008) | 9 lines Merged revisions 122127 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r122127 | murf | 2008-06-12 08:51:44 -0600 (Thu, 12 Jun 2008) | 1 line Arkadia tried to warn me, but the code added to ast_cdr_busy, _failed, and _noanswer was redundant. Didn't spot it until I was resolving conflicts in trunk. Ugh. Redundant code removed. It wasn't harmful. Just dumb. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@122129 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_forkcdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c index 4c6e620fb..c14564be3 100644 --- a/apps/app_forkcdr.c +++ b/apps/app_forkcdr.c @@ -83,7 +83,7 @@ static char *descrip = "cdr record is set to the current time. Future hang-up or ending events\n" "will not override this time stamp.\n" "Next, If the 'A' option is specified, the original cdr record will have\n" -"it ANS_LOCKED flag set, which prevent future call dispostion events\n" +"it ANS_LOCKED flag set, which prevent future answer events\n" "from updating the original cdr record's disposition. Normally, an\n" "'ANSWERED' event would mark all cdr records in the chain as 'ANSWERED'.\n" "Next, if the 'T' option is specified, the original cdr record will have\n" -- cgit v1.2.3