asterisk-xmpp merge in
authorMatt O'Gorman <mogorman@digium.com>
Mon, 22 May 2006 21:12:30 +0000 (21:12 +0000)
committerMatt O'Gorman <mogorman@digium.com>
Mon, 22 May 2006 21:12:30 +0000 (21:12 +0000)
commit7aa1a77e755fbda1b49b587afd9e7222c3af7576
treed1895da5e48cb7c2696f1e79242e88dd0d35b3f6
parent64b94dad8055626bf3e94ada1a3d2d175fb368ad
asterisk-xmpp merge in

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29553 65c4cc65-6c06-0410-ace0-fbb531ad65f3
15 files changed:
build_tools/menuselect-deps.in
channels/Makefile
channels/chan_jingle.c [new file with mode: 0644]
configs/extensions.conf.sample
configs/jabber.conf.sample [new file with mode: 0644]
configs/jingle.conf.sample [new file with mode: 0644]
configure.ac
doc/jabber.txt [new file with mode: 0644]
doc/jingle.txt [new file with mode: 0644]
include/asterisk/jabber.h [new file with mode: 0644]
include/asterisk/jingle.h [new file with mode: 0644]
include/autoconfig.h.in
makeopts.in
res/Makefile
res/res_jabber.c [new file with mode: 0644]