Mercurial > prosody-hg

comparison util/stanza.lua @ 4541:05f5ec99da77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 22 Jan 2012 22:55:49 +0000
parents 2ee422bdafbe
children b9de59ea8dad
comparison
equal deleted inserted replaced
4530:40905e7bf680 4541:05f5ec99da77
256 end 256 end
257 end 257 end
258 return type, condition or "undefined-condition", text; 258 return type, condition or "undefined-condition", text;
259 end 259 end
260 260
261 function stanza_mt.__add(s1, s2)
262 return s1:add_direct_child(s2);
263 end
264
265
266 do 261 do
267 local id = 0; 262 local id = 0;
268 function new_id() 263 function new_id()
269 id = id + 1; 264 id = id + 1;
270 return "lx"..id; 265 return "lx"..id;