summaryrefslogtreecommitdiff
path: root/doc/jingle.txt
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-05-22 22:02:38 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-05-22 22:02:38 +0000
commit3891339581d6eace47a41eb930baf9fb3f690142 (patch)
tree907e1e54a23f1163cb497cfffdd805a76fd5ce89 /doc/jingle.txt
parent822a3e81c9f613bb8268399256ff53f3e3dfc298 (diff)
remove properties from the xmpp merge
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29570 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'doc/jingle.txt')
0 files changed, 0 insertions, 0 deletions