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

Conflicts: pyfpdb/HUD_config.xml.example
2009-01-05 10:53:10 -05:00
parent 84653ff99c 0857739d83
commit 644201e669
16 changed files with 3729 additions and 2608 deletions
@@ -61,7 +61,7 @@
 	        </layout>
 	    </site>
 	    <site enabled="True"
-	    site_name="Full Tilt"
+	    site_name="Full Tilt Poker"
 	    table_finder="FullTiltPoker.exe"
 	    screen_name="ENTER HERO NAME"
 	    site_path=""