[svn-commits] rmudgett: branch group/issue14292 r691 - in /team/group/issue14292: ./ libpri.h

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Feb  2 16:03:38 2009
New Revision: 691

URL: http://svn.digium.com/svn-view/libpri?view=rev&rev=691
Log:
Resolved conflict and restarted automerge

Merged revisions 689 via svnmerge from 
https://origsvn.digium.com/svn/libpri/team/group/issue14068

................
  r689 | root | 2009-02-02 15:31:17 -0600 (Mon, 02 Feb 2009) | 12 lines
  
  Merged revisions 687 via svnmerge from 
  file:///srv/subversion/repos/libpri/branches/1.4
  
  ........
    r687 | lmadsen | 2009-02-02 14:18:03 -0600 (Mon, 02 Feb 2009) | 4 lines
    
    Fix a small spelling error.
    
    (closes issue #14375)
    Reported by: jeremy1
  ........
................

Modified:
    team/group/issue14292/   (props changed)
    team/group/issue14292/libpri.h

Propchange: team/group/issue14292/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/issue14292/
------------------------------------------------------------------------------
--- issue14292-integrated (original)
+++ issue14292-integrated Mon Feb  2 16:03:38 2009
@@ -1,1 +1,1 @@
-/team/group/issue14068:1-685
+/team/group/issue14068:1-690

Propchange: team/group/issue14292/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb  2 16:03:38 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-681
+/branches/1.4:1-688

Modified: team/group/issue14292/libpri.h
URL: http://svn.digium.com/svn-view/libpri/team/group/issue14292/libpri.h?view=diff&rev=691&r1=690&r2=691
==============================================================================
--- team/group/issue14292/libpri.h (original)
+++ team/group/issue14292/libpri.h Mon Feb  2 16:03:38 2009
@@ -807,7 +807,7 @@
 /* Set a no channel call (i.e. QSIG-CCBS/CCNR) */
 int pri_sr_set_no_channel_call(struct pri_sr *req);
 
-/* Send an MWI indication to a remote location.  If activate is non zero, activates, if zero, decativates */
+/* Send an MWI indication to a remote location.  If activate is non zero, activates, if zero, deactivates */
 int pri_mwi_activate(struct pri *pri, q931_call *c, char *caller, int callerplan, char *callername, int callerpres, char *called, int calledplan);
 
 /* Send an MWI deactivate request to a remote location */