[svn-commits] file: branch file/audiohooks r78639 - in /team/file/audiohooks: ./ channels/

[SVN commits to the Digium repositories]

Author: file
Date: Wed Aug  8 14:17:10 2007
New Revision: 78639

URL: http://svn.digium.com/view/asterisk?view=rev&rev=78639
Log:
Merged revisions 78635,78637 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r78635 | mmichelson | 2007-08-08 15:34:16 -0300 (Wed, 08 Aug 2007) | 11 lines

Blocked revisions 78620 via svnmerge

........
r78620 | mmichelson | 2007-08-08 13:16:49 -0500 (Wed, 08 Aug 2007) | 4 lines

Fixed some compiler warnings so that compiling with dev-mode and IMAP storage would not have any errors.
This section of code may get changed again shortly since my change uncovers a rather silly bit of logic.


........

................
r78637 | file | 2007-08-08 16:03:46 -0300 (Wed, 08 Aug 2007) | 2 lines

Correct spelling. s/threaads/threads/

................

Modified:
    team/file/audiohooks/   (props changed)
    team/file/audiohooks/channels/chan_iax2.c

Propchange: team/file/audiohooks/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/file/audiohooks/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug  8 14:17:10 2007
@@ -1,1 +1,1 @@
-/trunk:1-78607
+/trunk:1-78638

Modified: team/file/audiohooks/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/file/audiohooks/channels/chan_iax2.c?view=diff&rev=78639&r1=78638&r2=78639
==============================================================================
--- team/file/audiohooks/channels/chan_iax2.c (original)
+++ team/file/audiohooks/channels/chan_iax2.c Wed Aug  8 14:17:10 2007
@@ -8948,7 +8948,7 @@
 	}
 	ast_pthread_create_background(&schedthreadid, NULL, sched_thread, NULL);
 	ast_pthread_create_background(&netthreadid, NULL, network_thread, NULL);
-	ast_verb(2, "%d helper threaads started\n", threadcount);
+	ast_verb(2, "%d helper threads started\n", threadcount);
 	return 0;
 }