Comparison

plugins/jingle.lua @ 255:be126fe7c4e7

Merge with MattJ & mva
author Kim Alvefur <zash@zash.se>
date Sat, 03 Dec 2011 19:46:47 +0100
parent 250:a5ac643a7fd6
child 341:a95890d86fe4
comparison
equal deleted inserted replaced
254:616cc6a5fd30 255:be126fe7c4e7
1 local verse = require "verse";
1 local sha1 = require "util.sha1".sha1; 2 local sha1 = require "util.sha1".sha1;
2 local timer = require "util.timer"; 3 local timer = require "util.timer";
3 local uuid_generate = require "util.uuid".generate; 4 local uuid_generate = require "util.uuid".generate;
4 5
5 local xmlns_jingle = "urn:xmpp:jingle:1"; 6 local xmlns_jingle = "urn:xmpp:jingle:1";