Steffen Schaumburg 28dead2905 Merge branch 'next' ...

Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/locale/de/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/es/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/fpdb-de_DE.po
	pyfpdb/locale/fpdb-en_GB.pot
	pyfpdb/locale/fpdb-es_ES.po
	pyfpdb/locale/fpdb-fr_FR.po
	pyfpdb/locale/fpdb-hu_HU.po
	pyfpdb/locale/fpdb-it_IT.po
	pyfpdb/locale/fpdb-pl_PL.po
	pyfpdb/locale/fpdb-pt_BR.po
	pyfpdb/locale/fpdb-ru_RU.po
	pyfpdb/locale/fpdb-zh_CN.po
	pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/it/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/pl/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/pt/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/ru/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/zh/LC_MESSAGES/fpdb.mo

2011-04-10 19:14:20 +02:00

..

FLO8-10max-USD-0.50-1.00-201003.HU.on.10max.txt

Merge

2010-09-26 17:19:05 +02:00

NLHE-6max-USD-0.05-0.10-29Aug2010.txt

Replaced all of the Hero names in the regression files with 'Hero'

2010-12-05 17:28:31 -05:00

NLHE-10max-USD-0.01-0.02-2010-08-03.fixed_wtsd_bug.txt

testing: everleaf hand

2011-04-08 13:40:40 +02:00

NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt

…

NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp

testing: add showed, runIt, fileID to expected results

2011-04-10 15:51:06 +02:00

NLHE-EUR-0.01-0.02-20091027.partouche.txt

rename partouche file so it can be picked up by THP

2011-04-08 08:48:18 +02:00

PLO8-10max-USD-0.05-0.10-201003.HU.on.10max.txt

Merge

2010-09-26 17:19:05 +02:00