aboutsummaryrefslogtreecommitdiffstats
path: root/fallbacks
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-04-02 17:41:38 +0100
committerMatthew Wild <mwild1@gmail.com>2014-04-02 17:41:38 +0100
commitda820882348572de470a13a1a50f529a51243aa5 (patch)
tree39ca42dddf3935546a0c3c37b2e2456a554899f1 /fallbacks
parent618661cda2a68afbe445ce079c15af25bdaa177b (diff)
parentf7d4b04bf17c8b634eae00e814a995a88c5ba6cb (diff)
downloadprosody-da820882348572de470a13a1a50f529a51243aa5.tar.gz
prosody-da820882348572de470a13a1a50f529a51243aa5.zip
Merge 0.9->0.10
Diffstat (limited to 'fallbacks')
-rw-r--r--fallbacks/bit.lua2
-rw-r--r--fallbacks/lxp.lua4
2 files changed, 3 insertions, 3 deletions
diff --git a/fallbacks/bit.lua b/fallbacks/bit.lua
index 2482c473..28dca4e6 100644
--- a/fallbacks/bit.lua
+++ b/fallbacks/bit.lua
@@ -1,7 +1,7 @@
-- Prosody IM
-- Copyright (C) 2008-2010 Matthew Wild
-- Copyright (C) 2008-2010 Waqas Hussain
---
+--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
diff --git a/fallbacks/lxp.lua b/fallbacks/lxp.lua
index 6d3297d1..ac1c9a03 100644
--- a/fallbacks/lxp.lua
+++ b/fallbacks/lxp.lua
@@ -61,7 +61,7 @@ local function parser(data, handlers, ns_separator)
while #data == 0 do data = coroutine.yield(); end
return data:sub(1,1);
end
-
+
local ns = { xml = "http://www.w3.org/XML/1998/namespace" };
ns.__index = ns;
local function apply_ns(name, dodefault)
@@ -100,7 +100,7 @@ local function parser(data, handlers, ns_separator)
ns = getmetatable(ns);
return tag;
end
-
+
while true do
if peek() == "<" then
local elem = read_until(">"):sub(2,-2);