[asterisk-commits] branch russell/make_output - r8092 in /team/russell/make_output: ./ channel.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Jan 15 21:30:57 2006
New Revision: 8092

URL: http://svn.digium.com/view/asterisk?rev=8092&view=rev
Log:
Merged revisions 8087-8090 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r8087 | russell | 2006-01-15 20:32:46 -0500 (Sun, 15 Jan 2006) | 2 lines

block appropriate revisions from being merged from 1.2 ...

................
r8088 | russell | 2006-01-15 20:36:10 -0500 (Sun, 15 Jan 2006) | 1 line


................
r8089 | russell | 2006-01-15 20:46:15 -0500 (Sun, 15 Jan 2006) | 8 lines

block more revisions ...

TO ALL DEVELOPERS WITH COMMIT ACCESS:
Please remember to *always* do an 'svnmerge block -r <rev#>' on the trunk
every single time you make a commit to the 1.2 branch which will not be pulled
into the trunk using svnmerge.  This is important for us to be able to take
full advatage of this tool.

................
r8090 | russell | 2006-01-15 20:47:02 -0500 (Sun, 15 Jan 2006) | 10 lines

Merged revisions 7963 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7963 | mogorman | 2006-01-10 23:38:07 -0500 (Tue, 10 Jan 2006) | 2 lines

Minor typo refrenced in 6191

........

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

Modified:
    team/russell/make_output/   (props changed)
    team/russell/make_output/channel.c

Propchange: team/russell/make_output/
------------------------------------------------------------------------------
--- svnmerge-blocked (added)
+++ svnmerge-blocked Sun Jan 15 21:30:57 2006
@@ -1,0 +1,1 @@
+/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047

Propchange: team/russell/make_output/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jan 15 21:30:57 2006
@@ -1,1 +1,1 @@
-/trunk:1-8081
+/trunk:1-8091

Modified: team/russell/make_output/channel.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/channel.c?rev=8092&r1=8091&r2=8092&view=diff
==============================================================================
--- team/russell/make_output/channel.c (original)
+++ team/russell/make_output/channel.c Sun Jan 15 21:30:57 2006
@@ -561,7 +561,7 @@
 	tmp->fds[AST_MAX_FDS-1] = tmp->alertpipe[0];
 	/* And timing pipe */
 	tmp->fds[AST_MAX_FDS-2] = tmp->timingfd;
-	strcpy(tmp->name, "**Unkown**");
+	strcpy(tmp->name, "**Unknown**");
 	/* Initial state */
 	tmp->_state = AST_STATE_DOWN;
 	tmp->streamid = -1;