summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Vossel <dvossel@digium.com>2010-10-07 22:39:29 +0000
committerDavid Vossel <dvossel@digium.com>2010-10-07 22:39:29 +0000
commitb28654920edf0dbb91644125a0035c81fc38a0e1 (patch)
tree999d86555468d0b2845073bbc91464a5b2a429d5
parentf3bb67f77c288352eab3a43af67217a689762419 (diff)
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! ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@290831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_gtalk.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 81a4772b5..4d9695b25 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -4,6 +4,7 @@
* Copyright (C) 1999 - 2005, Digium, Inc.
*
* Matt O'Gorman <mogorman@digium.com>
+ * Philippe Sultan <philippe.sultan@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@digium.com>
+ * \author Philippe Sultan <philippe.sultan@gmail.com>
*
* \brief Gtalk Channel Driver, until google/libjingle works with jingle spec
*