From 357eeee9d45082e8f54c44c2b41188d27a4d42f1 Mon Sep 17 00:00:00 2001
From: steffen123 <steffen@schaumburger.info>
Date: Sat, 26 Jun 2010 08:38:37 +0200
Subject: [PATCH 1/2] Added a minimal readme

---
 readme.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 readme.txt

diff --git a/readme.txt b/readme.txt
new file mode 100644
index 00000000..58025233
--- /dev/null
+++ b/readme.txt
@@ -0,0 +1 @@
+Please visit http://fpdb.sourceforge.net for documentation, tips and help.

From 68e3f5b18195eceba5cf5b2e2e226b5d19a99e71 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Thu, 1 Jul 2010 21:53:24 +0800
Subject: [PATCH 2/2] CarbonPokerToFpdb: Fix for Black Chip poker

This site records a timestamp for every action
---
 pyfpdb/CarbonToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/CarbonToFpdb.py b/pyfpdb/CarbonToFpdb.py
index 0640d157..3173a788 100644
--- a/pyfpdb/CarbonToFpdb.py
+++ b/pyfpdb/CarbonToFpdb.py
@@ -79,7 +79,7 @@ class Carbon(HandHistoryConverter):
     #re_Antes = ???
     #re_BringIn = ???
     re_HeroCards = re.compile(r'<cards type="HOLE" cards="(?P<CARDS>.+)" player="(?P<PSEAT>[0-9])"', re.MULTILINE)
-    re_Action = re.compile(r'<event sequence="[0-9]+" type="(?P<ATYPE>FOLD|CHECK|CALL|BET|RAISE|ALL_IN|SIT_OUT)" player="(?P<PSEAT>[0-9])"( amount="(?P<BET>[.0-9]+)")?/>', re.MULTILINE)
+    re_Action = re.compile(r'<event sequence="[0-9]+" type="(?P<ATYPE>FOLD|CHECK|CALL|BET|RAISE|ALL_IN|SIT_OUT)" (?P<TIMESTAMP>timestamp="[0-9]+" )?player="(?P<PSEAT>[0-9])"( amount="(?P<BET>[.0-9]+)")?/>', re.MULTILINE)
     re_ShowdownAction = re.compile(r'<cards type="SHOWN" cards="(?P<CARDS>..,..)" player="(?P<PSEAT>[0-9])"/>', re.MULTILINE)
     re_CollectPot = re.compile(r'<winner amount="(?P<POT>[.0-9]+)" uncalled="(true|false)" potnumber="[0-9]+" player="(?P<PSEAT>[0-9])"', re.MULTILINE)
     re_SitsOut = re.compile(r'<event sequence="[0-9]+" type="SIT_OUT" player="(?P<PSEAT>[0-9])"/>', re.MULTILINE)