summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorDavid Vossel <dvossel@digium.com>2010-10-11 21:44:34 +0000
committerDavid Vossel <dvossel@digium.com>2010-10-11 21:44:34 +0000
commit3e6c19a83720785f6305270d3288478d78d8bcd5 (patch)
treeac556918d14fe2daa3f067519d3a7e018193a2a1 /CHANGES
parent0736871cc67ba6c234bfefc6d87a567ad48df510 (diff)
Merged revisions 291194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r291194 | dvossel | 2010-10-11 16:44:04 -0500 (Mon, 11 Oct 2010) | 2 lines Update CHANGES to reflect new gtalk.conf options. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 64f104832..4b4206e21 100644
--- a/CHANGES
+++ b/CHANGES
@@ -107,6 +107,12 @@ MGCP Changes
* PacketCable NCS 1.0 support has been added for Docsis/Eurodocsis Networks.
See configs/res_pktccops.conf for more information.
+XMPP Google Talk/Jingle changes
+-------------------------------
+ * Added the externip option to gtalk.conf.
+ * Added the stunaddr option to gtalk.conf which allows for the automatic
+ retrieval of the external ip from a stun server.
+
Applications
------------
* Added 'p' option to PickupChan() to allow for picking up channel by the first