zorba-coders team mailing list archive

[Sorin Marian Nasoi <sorin.marian.nasoi@xxxxxxxxx>]

Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/stack into lp:zorba.

Requested reviews:
  Sorin Marian Nasoi (sorin.marian.nasoi)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/stack/+merge/96000

Queue and Stack module fixes.
-- 
https://code.launchpad.net/~zorba-coders/zorba/stack/+merge/96000
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2012-02-28 20:45:43 +0000
+++ modules/ExternalModules.conf	2012-03-05 20:51:27 +0000
@@ -39,4 +39,10 @@
 security        bzr  lp:zorba/security-module            zorba-2.1
 system          bzr  lp:zorba/system-module              zorba-2.1
 xqxq            bzr  lp:zorba/xqxq-module                zorba-2.1
-email           bzr  lp:zorba/email-module               zorba-2.1
+<<<<<<< TREE
+email           bzr  lp:zorba/email-module               zorba-2.1
+=======
+stack           bzr  lp:~zorba-coders/zorba/my_stack
+queue           bzr  lp:~zorba-coders/zorba/my_queue
+email           bzr  lp:zorba/email-module               zorba-2.1
+>>>>>>> MERGE-SOURCE

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-01-20 21:48:24 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-03-05 20:51:27 +0000
@@ -1414,7 +1414,7 @@
             substring-before($rest, ") external")
           (: no external function :)
           else
-            $rest
+            substring-before($rest, ")")
         (: the return type is specified :)
         else
           $tmp