[asterisk-commits] dvossel: trunk r290831 - in /trunk: ./ channels/chan_gtalk.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Oct  7 17:39:29 2010
New Revision: 290831

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=290831
Log:
Merged revisions 290829 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r290829 | dvossel | 2010-10-07 17:38:05 -0500 (Thu, 07 Oct 2010) | 6 lines
  
  Add Philippe Sultan to chan_gtalk author list.
  
  Philippe has made some notable contributions to the
  gtalk channel driver.  His name deserves to be listed
  amoung the authors of that file.  Thanks Philippe!
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_gtalk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=290831&r1=290830&r2=290831
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Thu Oct  7 17:39:29 2010
@@ -4,6 +4,7 @@
  * Copyright (C) 1999 - 2005, Digium, Inc.
  *
  * Matt O'Gorman <mogorman at digium.com>
+ * Philippe Sultan <philippe.sultan at gmail.com>
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact
@@ -19,6 +20,7 @@
 /*! \file
  *
  * \author Matt O'Gorman <mogorman at digium.com>
+ * \author Philippe Sultan <philippe.sultan at gmail.com>
  *
  * \brief Gtalk Channel Driver, until google/libjingle works with jingle spec
  *