Merge branch 'dev'

AIE-Guild · Jul 21, 2014 · 8e153db · 8e153db
2 parents e5eadbb + 20088a0
commit 8e153db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/WsGreenWall.lua b/WsGreenWall.lua
@@ -525,7 +525,7 @@ end
 
 function WsGreenWall:DecryptMessage(tMessage, key, nonce)
     local function f(t)
-        return MapElem(Salsa20.decrypt_table(key, nonce, t, 8), Base64.decode) 
+        return Salsa20.decrypt_table(key, nonce, MapElem(t, Base64.decode), 8)
     end
     self:Debug("decrypting with key=%s, nonce=%s", Str2Hex(key), Str2Hex(nonce))
     return self:TransmogrifyMessage(tMessage, f)

diff --git a/toc.xml b/toc.xml
@@ -26,7 +26,7 @@ SOFTWARE.
 
 -->
 <?xml version="1.0" encoding="UTF-8"?>
-<Addon Author="Mark Rogaski" APIVersion="9" Name="WsGreenWall" Version="1.0.0-alpha.9" Description="Guild chat bridging for WildStar.">
+<Addon Author="Mark Rogaski" APIVersion="9" Name="WsGreenWall" Version="1.0.0-alpha.10" Description="Guild chat bridging for WildStar.">
     <Script Name="WsGreenWall.lua"/>
     <Form Name="WsGreenWall.xml"/>
     <Script Name="Libs\Base64.lua"/>