Comparison

util/jid.lua @ 7324:7e6409462f79

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 29 Mar 2016 15:38:14 +0200
parent 7321:a7199fc8a50e
child 7670:2be85cb3bc66
comparison
equal deleted inserted replaced
7320:3849b5187d47 7324:7e6409462f79
6 -- COPYING file in the source package for more information. 6 -- COPYING file in the source package for more information.
7 -- 7 --
8 8
9 9
10 10
11 local select = select;
11 local match, sub = string.match, string.sub; 12 local match, sub = string.match, string.sub;
12 local nodeprep = require "util.encodings".stringprep.nodeprep; 13 local nodeprep = require "util.encodings".stringprep.nodeprep;
13 local nameprep = require "util.encodings".stringprep.nameprep; 14 local nameprep = require "util.encodings".stringprep.nameprep;
14 local resourceprep = require "util.encodings".stringprep.resourceprep; 15 local resourceprep = require "util.encodings".stringprep.resourceprep;
15 16