Merge branch 'master' of git://git.assembla.com/fpdboz

Conflicts: pyfpdb/Database.py
2009-03-12 12:13:03 -04:00
parent 6bf7be6ae5 2d849c69e7
commit 2ac4e26337
9 changed files with 227 additions and 174 deletions
@@ -158,7 +158,7 @@ class Database:
            if cv not in d or d[cv] == None:
                break
            elif d[cv] == 0:
-                cards = "%sxx" % cards
+                cards += "xx"
            else:
                cs = "card%dSuit" % i
                cards = "%s%s%s" % (cards, ranks[d[cv]], d[cs])