[svn-commits] russell: branch russell/chan_refcount r90140 - in /team/russell/chan_refcount...

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Nov 28 17:49:03 2007
New Revision: 90140

URL: http://svn.digium.com/view/asterisk?view=rev&rev=90140
Log:
resolve conflict with trunk

Modified:
    team/russell/chan_refcount/   (props changed)
    team/russell/chan_refcount/include/asterisk/channel.h

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov 28 17:49:03 2007
@@ -1,1 +1,1 @@
-/trunk:1-90134
+/trunk:1-90139

Modified: team/russell/chan_refcount/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/include/asterisk/channel.h?view=diff&rev=90140&r1=90139&r2=90140
==============================================================================
--- team/russell/chan_refcount/include/asterisk/channel.h (original)
+++ team/russell/chan_refcount/include/asterisk/channel.h Wed Nov 28 17:49:03 2007
@@ -1058,7 +1058,7 @@
  *
  * Write text to a display on a channel
  *
- * \note The channel must be locked before calling this function.
+ * \note The channel does not need to be locked before calling this function.
  *
  * \retval 0 on success 
  * \retval -1 on failure