Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							1e788621a5 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/FulltiltToFpdb.py 
						
					 
					
						2009-03-22 01:35:03 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							86d350984e 
							
						 
					 
					
						
						
							
							Dodgy 6 max fix to FTP converter  
						
						
						
					 
					
						2009-03-22 01:31:36 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							2675a681b8 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools  
						
						
						
					 
					
						2009-03-22 01:31:05 +09:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							f870d4c283 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb.git  
						
						
						
					 
					
						2009-03-21 12:06:00 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							cb34be8454 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						
						
					 
					
						2009-03-21 12:04:18 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							39db65b65d 
							
						 
					 
					
						
						
							
							Fix bug in defaults of import params + bug in printing same.  
						
						
						
					 
					
						2009-03-21 11:38:17 -04:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							239330ae7b 
							
						 
					 
					
						
						
							
							filterCrap after checking if hand is in db  
						
						... 
						
						
						
						refactor GuiBulkImport : add main() so that it can be called from
interactive shell (for profiling purposes). 
						
					 
					
						2009-03-21 15:34:23 +00:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							451a9b3ab1 
							
						 
					 
					
						
						
							
							GuiBulkImport: import directories from cmdline. Basically now does what  
						
						... 
						
						
						
						CliFpdb should do, but reads most settings from xml config. 
						
					 
					
						2009-03-21 14:27:49 +00:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							7f6128af8d 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						
						
					 
					
						2009-03-21 05:51:30 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							93b0e65549 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools  
						
						
						
					 
					
						2009-03-21 13:30:57 +09:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							847fd5f6c1 
							
						 
					 
					
						
						
							
							Tool tips for FlopMucked.  
						
						
						
					 
					
						2009-03-20 19:32:02 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							d59016f249 
							
						 
					 
					
						
						
							
							Button clicking for FlopMucked.  
						
						
						
					 
					
						2009-03-20 19:28:57 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							72c0cdfa52 
							
						 
					 
					
						
						
							
							Needed to make previous commit work.  
						
						
						
					 
					
						2009-03-19 20:58:40 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							98df6f74a9 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools  
						
						
						
					 
					
						2009-03-20 08:41:35 +09:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							33055f7f86 
							
						 
					 
					
						
						
							
							Hello_menu demo added to Hello.py module.  
						
						
						
					 
					
						2009-03-19 16:10:18 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							75a94299f9 
							
						 
					 
					
						
						
							
							Make sure HUD_main gets community cards for AWs to use.  
						
						
						
					 
					
						2009-03-19 13:18:50 -04:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							82e540066c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools  
						
						
						
					 
					
						2009-03-19 13:41:17 +00:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							cbba16feaf 
							
						 
					 
					
						
						
							
							comment  
						
						
						
					 
					
						2009-03-19 13:41:05 +00:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							a8e14f3c89 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-eric  
						
						
						
					 
					
						2009-03-19 21:20:00 +09:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							0e89adc1db 
							
						 
					 
					
						
						
							
							clean up some more ugly  
						
						
						
					 
					
						2009-03-19 04:12:42 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							f552ab2470 
							
						 
					 
					
						
						
							
							more cleanup of junk  
						
						
						
					 
					
						2009-03-19 03:52:18 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							593691301b 
							
						 
					 
					
						
						
							
							move some junk around classifyLines, as it will normally run into the first stuff first, allowing us to shorten the execution for smaller hands  
						
						
						
					 
					
						2009-03-19 03:40:40 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							375e0ed7c9 
							
						 
					 
					
						
						
							
							fpdb_parse_logic: fix possible breakage i might've made to tournament parse  
						
						... 
						
						
						
						fpdb_simple: more usage of 'any' operator where appropriate 
						
					 
					
						2009-03-19 03:30:44 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							e4ac034774 
							
						 
					 
					
						
						
							
							extensive use of any() in WTSD WMSD calcs  
						
						
						
					 
					
						2009-03-18 23:48:23 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							f823db4eef 
							
						 
					 
					
						
						
							
							generateHudCacheData: fix the code for identifying cutoff, button, sb, bb  
						
						
						
					 
					
						2009-03-18 23:27:15 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							4830b72121 
							
						 
					 
					
						
						
							
							more cleanup  
						
						
						
					 
					
						2009-03-18 22:31:39 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							c6179a1b85 
							
						 
					 
					
						
						
							
							fix typo  
						
						
						
					 
					
						2009-03-18 22:05:01 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							5b532180a3 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/fpdb_save_to_db.py 
						
					 
					
						2009-03-18 21:39:12 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							8b933bbd7b 
							
						 
					 
					
						
						
							
							fpdb_import: formatting cleanup  
						
						... 
						
						
						
						fpdb_simple: significant performance enhancements likely in checkPositions, convertCardValuesBoard, filterCrap, float2int, isActionLine, isWinLine 
						
					 
					
						2009-03-18 21:22:04 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							530462cc72 
							
						 
					 
					
						
						
							
							Fix for too large mucked windows on Windows.  
						
						
						
					 
					
						2009-03-18 21:05:29 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							1b626271ee 
							
						 
					 
					
						
						
							
							fpdb_save_to_db: minor cleanup  
						
						
						
					 
					
						2009-03-18 17:15:21 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							a424a9c77d 
							
						 
					 
					
						
						
							
							fpdb_parse_logic: cleanup  
						
						
						
					 
					
						2009-03-18 17:07:32 -04:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							e9fd354115 
							
						 
					 
					
						
						
							
							handinfo  
						
						
						
					 
					
						2009-03-18 16:52:18 +00:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							8009281e5a 
							
						 
					 
					
						
						
							
							More fixing of import options.  
						
						
						
					 
					
						2009-03-18 12:32:34 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							4c67cad27a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						
						
					 
					
						2009-03-18 11:52:49 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							a5770722ad 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						
						
					 
					
						2009-03-18 11:52:24 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							e67f715f27 
							
						 
					 
					
						
						
							
							Another silly screw up.  
						
						
						
					 
					
						2009-03-18 11:37:36 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							e485a9c035 
							
						 
					 
					
						
						
							
							Fix silly cut/paste problem.  
						
						
						
					 
					
						2009-03-18 11:34:43 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							4e62a25d03 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						
						
					 
					
						2009-03-18 10:58:37 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							48c2c36de6 
							
						 
					 
					
						
						
							
							Put index dropping back in for postgres.  
						
						
						
					 
					
						2009-03-17 11:18:55 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							74ef867bb2 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						
						
					 
					
						2009-03-17 05:27:14 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							466f6c09c2 
							
						 
					 
					
						
						
							
							Make a whole bunch of config defaults work as desired.  
						
						
						
					 
					
						2009-03-16 23:34:00 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							42db4f03ee 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						
						
					 
					
						2009-03-16 21:18:22 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							067373b128 
							
						 
					 
					
						
						
							
							Fixed defaults for saveActions and fastStoreHudCache.  
						
						
						
					 
					
						2009-03-16 21:07:11 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							a93718f953 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						
						
					 
					
						2009-03-16 21:00:56 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							8e5396295d 
							
						 
					 
					
						
						
							
							some silly cleanup  
						
						
						
					 
					
						2009-03-16 20:52:50 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							80c3922bc0 
							
						 
					 
					
						
						
							
							remove pyc, merge with everyone else  
						
						... 
						
						
						
						remove some useless junk in fpdb.display_tab() 
						
					 
					
						2009-03-16 18:35:56 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							bc2277af74 
							
						 
					 
					
						
						
							
							Comment out index dropping for postgres--prevent hang.  
						
						
						
					 
					
						2009-03-16 18:23:45 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							66e734588c 
							
						 
					 
					
						
						
							
							Fix extra lines in previous commit.  
						
						
						
					 
					
						2009-03-16 18:00:57 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							fc411d6df7 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb.git  
						
						
						
					 
					
						2009-03-16 17:50:59 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							b79734167d 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz.git  
						
						
						
					 
					
						2009-03-16 17:49:34 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							4e8a347692 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						
						
					 
					
						2009-03-16 17:46:26 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							629d48ad9d 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb  
						
						
						
					 
					
						2009-03-16 08:24:08 +09:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							6d292c50d9 
							
						 
					 
					
						
						
							
							Use saveActions and fastStoreHudCache in fpdb_import, etc.  
						
						
						
					 
					
						2009-03-15 17:40:01 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							6f927e6b7b 
							
						 
					 
					
						
						
							
							saveActions and fastStoreHudCache added to import element.  
						
						
						
					 
					
						2009-03-15 15:54:22 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							9fca5a75b2 
							
						 
					 
					
						
						
							
							Allow saving of aux_window layouts.  
						
						
						
					 
					
						2009-03-15 15:27:47 -04:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							08dae30f1f 
							
						 
					 
					
						
						
							
							Ensure both holecards are known (holdem) or all four (omaha) before  
						
						... 
						
						
						
						printing a 'shows hand' line : not ideal, but legacy importer chokes
otherwise 
						
					 
					
						2009-03-15 16:51:50 +00:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							cfbdff5159 
							
						 
					 
					
						
						
							
							add -x command line option to specify converter  
						
						... 
						
						
						
						usage:
./GuiBulkImport -q -f lala.txt -x EverleafToFpdb 
						
					 
					
						2009-03-15 16:50:59 +00:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							40d98b11d9 
							
						 
					 
					
						
						
							
							PokerStarsToFpdb - PLO parsing update  
						
						
						
					 
					
						2009-03-15 14:32:52 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							b77bbed8a2 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools  
						
						
						
					 
					
						2009-03-15 12:37:07 +09:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							e0a406e66d 
							
						 
					 
					
						
						
							
							Make Configiuration.py executable.  
						
						
						
					 
					
						2009-03-14 12:54:52 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							5348737819 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-03-14 12:54:11 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							22ff84852b 
							
						 
					 
					
						
						
							
							Kludge maxseats for Stars  
						
						
						
					 
					
						2009-03-15 00:30:38 +09:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							51444f2ac4 
							
						 
					 
					
						
						
							
							print a showdown section if anyone showed any kind of hand (obv logic  
						
						... 
						
						
						
						not 100%, people can show cards without a showdown, but legacy importer
expects cards there, right?)
slight change to get through the horse test file 
						
					 
					
						2009-03-14 15:02:23 +00:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							faf19215e8 
							
						 
					 
					
						
						
							
							Make Hand initable without a hhc  
						
						... 
						
						
						
						Proof of concept code in test_PokerStars.py 
						
					 
					
						2009-03-14 23:01:40 +09:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							6e01ebaee2 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-03-14 14:00:47 +00:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							c1a7c45966 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-03-14 13:45:40 +00:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							547ffd0e41 
							
						 
					 
					
						
						
							
							tiny output bugs fixed.  
						
						
						
					 
					
						2009-03-14 13:45:09 +00:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							d847a71c6e 
							
						 
					 
					
						
						
							
							Move addDiscard from upper class to specialised DrawHand  
						
						
						
					 
					
						2009-03-14 22:23:30 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							a5ceeece3a 
							
						 
					 
					
						
						
							
							Added note about renamed test file  
						
						... 
						
						
						
						Also changed name of Bike test file so I can tell what it is from ls 
						
					 
					
						2009-03-14 22:18:30 +09:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							2caddfe97a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-03-14 12:48:13 +00:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							822546da7b 
							
						 
					 
					
						
						
							
							blinds can be all in.  
						
						
						
					 
					
						2009-03-14 12:44:14 +00:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							42e23ae449 
							
						 
					 
					
						
						
							
							Merge branch 'calcstats'  
						
						
						
					 
					
						2009-03-14 21:21:04 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							b41afcd076 
							
						 
					 
					
						
						
							
							Add stub insert and select methods to Hand class  
						
						
						
					 
					
						2009-03-14 21:19:20 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							d212d81e03 
							
						 
					 
					
						
						
							
							Add variables for most HudCache stats and add optional arg to Hand  
						
						... 
						
						
						
						Will almost certainly need to change all of the data structures in the
variables as they are only for a single player 
						
					 
					
						2009-03-14 20:40:27 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							311e79c6e6 
							
						 
					 
					
						
						
							
							Quick note on test file.  
						
						... 
						
						
						
						Intend on keeping better notes on test files so we can verify in testing
at some point 
						
					 
					
						2009-03-14 20:03:28 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							04b43e3b95 
							
						 
					 
					
						
						
							
							Add preliminary Badugi support  
						
						... 
						
						
						
						Done to flesh out what DrawHand will look like 
						
					 
					
						2009-03-14 19:48:34 +09:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							6eb489c3a5 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz.git  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/Hud.py 
						
					 
					
						2009-03-14 03:56:43 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							d389706e85 
							
						 
					 
					
						
						
							
							Revert dodgy import line  
						
						
						
					 
					
						2009-03-14 11:21:23 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							9cdfa5f279 
							
						 
					 
					
						
						
							
							Remove 3rd arg from Hud module loader  
						
						... 
						
						
						
						Mea culpa 
						
					 
					
						2009-03-14 11:06:47 +09:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							79d9bd6d58 
							
						 
					 
					
						
						
							
							make third parameter to importName() optional  
						
						
						
					 
					
						2009-03-13 18:09:25 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							69c026bd29 
							
						 
					 
					
						
						
							
							remove "import Utils"  
						
						
						
					 
					
						2009-03-13 18:05:27 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							d3103f099e 
							
						 
					 
					
						
						
							
							Make Stars Badugi recognised  
						
						
						
					 
					
						2009-03-14 06:42:20 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							93acab5bcb 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb  
						
						
						
					 
					
						2009-03-14 06:20:53 +09:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							d35184cc79 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz.git  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/fpdb_import.py 
						
					 
					
						2009-03-13 16:10:44 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							bbdbe7e47d 
							
						 
					 
					
						
						
							
							Remove TODO for previous patch  
						
						
						
					 
					
						2009-03-14 05:10:13 +09:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							2ad252ded6 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb.git  
						
						
						
					 
					
						2009-03-13 16:07:38 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							6ebab06981 
							
						 
					 
					
						
						
							
							Make converters dynamically loadable in autoimport  
						
						... 
						
						
						
						Adds 1 restriction to the HHC sub classes, the classname must be the
same as the filename - ToFpdb.py
FulltiltToFpdb.py must contain a hhc class named Fulltilt
EverleafToFpdb.py must contain a hhc class named Everleaf 
						
					 
					
						2009-03-14 05:00:12 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							875f218379 
							
						 
					 
					
						
						
							
							Move it back again, found another way  
						
						
						
					 
					
						2009-03-14 04:23:36 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							321e38a16f 
							
						 
					 
					
						
						
							
							Move 'plugin loader' to Utils file so HUD and Importer can share  
						
						
						
					 
					
						2009-03-14 03:10:53 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							f4e3c8de28 
							
						 
					 
					
						
						
							
							Remove lookupLimitBetSize() - appears to no longer be necessary  
						
						
						
					 
					
						2009-03-14 02:51:10 +09:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							21376c0b62 
							
						 
					 
					
						
						
							
							slight change in logic, I hope the this is right:  
						
						... 
						
						
						
						if win & show : player showed [x] and won $
elif win: player won $
elif folded: player folded
else: if shown: player showed [x] and lost...
      else: player mucked 
						
					 
					
						2009-03-13 16:50:46 +00:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							771a95fe32 
							
						 
					 
					
						
						
							
							if holecards can be infered from summary line, indicate that they were  
						
						... 
						
						
						
						'shown' so that they can be output in summary line 
						
					 
					
						2009-03-13 16:45:32 +00:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							a5b9ea860d 
							
						 
					 
					
						
						
							
							fix runUpdated() to not freak out if a file disappears on it  
						
						
						
					 
					
						2009-03-13 06:21:48 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							382ed4b067 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz.git  
						
						
						
					 
					
						2009-03-13 06:14:43 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							a7f7113705 
							
						 
					 
					
						
						
							
							Make determineGameType return 'tour' of currency is T$  
						
						
						
					 
					
						2009-03-13 18:45:15 +09:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							f0413a66f5 
							
						 
					 
					
						
						
							
							Fix moved method, but didn't change reference.  
						
						
						
					 
					
						2009-03-12 17:58:12 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							46f246e27d 
							
						 
					 
					
						
						
							
							Change a rogue xrange back to range.  
						
						
						
					 
					
						2009-03-12 17:51:29 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							104ca5fd9e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz.git  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/fpdb_import.py 
						
					 
					
						2009-03-12 13:27:06 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							9caa8b9361 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb.git  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/fpdb_import.py 
						
					 
					
						2009-03-12 13:23:32 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							81df5a8919 
							
						 
					 
					
						
						
							
							Add Full Tilt flhe o supported games  
						
						
						
					 
					
						2009-03-13 02:21:31 +09:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							3a6c80825d 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-03-12 13:19:28 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							d8a689b9fe 
							
						 
					 
					
						
						
							
							Quick fix  
						
						
						
					 
					
						2009-03-13 02:18:34 +09:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							2ac4e26337 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/Database.py 
						
					 
					
						2009-03-12 12:13:03 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							2d849c69e7 
							
						 
					 
					
						
						
							
							Refactor HHC call a bit, make sure out_fh gets closed  
						
						
						
					 
					
						2009-03-13 00:31:29 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							c523fce123 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/fpdb_import.py 
						
					 
					
						2009-03-12 22:57:43 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							73d643b753 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-eric  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/Database.py 
						
					 
					
						2009-03-12 22:52:48 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							0bd2ecc2fe 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/Database.py
	pyfpdb/Mucked.py 
						
					 
					
						2009-03-12 22:48:46 +09:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							76e467a5d4 
							
						 
					 
					
						
						
							
							get rid of thread  
						
						
						
					 
					
						2009-03-12 12:24:23 +00:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							27a0db56bb 
							
						 
					 
					
						
						
							
							Add test file for betfair  
						
						
						
					 
					
						2009-03-12 20:01:41 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							63a4d3f605 
							
						 
					 
					
						
						
							
							Fix test_fpdb_simple.py's tests  
						
						
						
					 
					
						2009-03-12 19:51:03 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							2bb4593672 
							
						 
					 
					
						
						
							
							Compare determineGameType to readSupportedGames  
						
						... 
						
						
						
						Allows us to parse the header (and test it) and still skip the file.
May produce empty files in autoimport... 
						
					 
					
						2009-03-12 19:43:28 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							bb2104e5f8 
							
						 
					 
					
						
						
							
							First successful Betfair import  
						
						
						
					 
					
						2009-03-12 18:38:48 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							8126972731 
							
						 
					 
					
						
						
							
							Betfair update. Now doesn't crash on test file.  
						
						... 
						
						
						
						Board and Hero cards are read. Actions all appear to be failing. 
						
					 
					
						2009-03-12 18:23:20 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							19ec7662e1 
							
						 
					 
					
						
						
							
							BetfairToFpdb - HandInfo regex  
						
						
						
					 
					
						2009-03-12 17:26:15 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							76ca6beab0 
							
						 
					 
					
						
						
							
							Update Betfair importer a bit  
						
						... 
						
						
						
						No longer crashes on test file, but doesn't actually import anything
yet. 
						
					 
					
						2009-03-12 15:17:46 +09:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							02c5cfb39e 
							
						 
					 
					
						
						
							
							remove call to hhc.processFile as someone removed that function  
						
						
						
					 
					
						2009-03-12 01:18:31 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							fbbd2c4d5c 
							
						 
					 
					
						
						
							
							asdfsadfsadfasdfsadf  
						
						
						
					 
					
						2009-03-12 00:10:34 -04:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							cd3d4ef835 
							
						 
					 
					
						
						
							
							no longer 'safely' appends -- will now overwrite out_path.  
						
						
						
					 
					
						2009-03-12 03:58:42 +00:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							ff675fb3ae 
							
						 
					 
					
						
						
							
							import working?  
						
						
						
					 
					
						2009-03-12 03:15:34 +00:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							9d7395a61c 
							
						 
					 
					
						
						
							
							unbreak psuedo-recursion  
						
						
						
					 
					
						2009-03-11 23:10:31 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							6bf7be6ae5 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-eric  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/Database.py 
						
					 
					
						2009-03-11 22:46:28 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							27e0df2a24 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz.git  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/Database.py 
						
					 
					
						2009-03-11 22:41:43 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							1fb6e5bfeb 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/Database.py
	pyfpdb/Mucked.py 
						
					 
					
						2009-03-11 22:36:10 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							c582507b9f 
							
						 
					 
					
						
						
							
							Quick fix for typo - Fixes FTP Razz import  
						
						
						
					 
					
						2009-03-12 10:49:16 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							0dfcac19fb 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb  
						
						
						
					 
					
						2009-03-12 08:56:21 +09:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							509192d23e 
							
						 
					 
					
						
						
							
							call update_table_position() immediatly after creating a hud mainwindow, so that we can be sure we have both X/Y set on all platforms  
						
						
						
					 
					
						2009-03-11 17:12:35 -04:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							89bb8e3d69 
							
						 
					 
					
						
						
							
							stars stud sometimes says 'brings-in', 'brings in', 'brings in low'  
						
						... 
						
						
						
						fewer negative rakes appearing. 
						
					 
					
						2009-03-11 18:40:17 +00:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							8887ea7099 
							
						 
					 
					
						
						
							
							A start on saving aux_win layouts. More to come.  
						
						
						
					 
					
						2009-03-11 14:12:56 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							23c1e0c405 
							
						 
					 
					
						
						
							
							add 3/6 FL to Everleaf table  
						
						
						
					 
					
						2009-03-11 12:56:38 -04:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							0058f47775 
							
						 
					 
					
						
						
							
							fulltilt razz. is this complete? can you check whether it imports?  
						
						
						
					 
					
						2009-03-11 16:51:58 +00:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							c2d7822dfc 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb  
						
						
						
					 
					
						2009-03-12 00:57:14 +09:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							dba348edf3 
							
						 
					 
					
						
						
							
							detect horse:omaha hilo  
						
						... 
						
						
						
						also appears to parse regression-test-files/stars/omahaHL.txt 
						
					 
					
						2009-03-11 14:42:49 +00:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							ccb9bc07a7 
							
						 
					 
					
						
						
							
							small t tilted me  
						
						
						
					 
					
						2009-03-11 14:37:31 +00:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							cfbf57dd1b 
							
						 
					 
					
						
						
							
							if dont have site and BB in lookupLimit table, just halve them for  
						
						... 
						
						
						
						sb,bb. Should work for higher limits almost always anyway, and there are
a finite number of ulimits which we should already have in the table 
						
					 
					
						2009-03-11 14:33:07 +00:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							71c5e1300d 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb  
						
						
						
					 
					
						2009-03-11 23:12:22 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							fb141fd85d 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb  
						
						
						
					 
					
						2009-03-11 23:09:55 +09:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							904c108813 
							
						 
					 
					
						
						
							
							people who put in blinds or antes are also counted as actors preflop  
						
						
						
					 
					
						2009-03-11 14:07:38 +00:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							1bbb2f2769 
							
						 
					 
					
						
						
							
							here you go  
						
						
						
					 
					
						2009-03-11 14:05:38 +00:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							bd792142bd 
							
						 
					 
					
						
						
							
							Convert RegressionTest.py into test.py format.  
						
						... 
						
						
						
						Still doesn't work and i'm confused 
						
					 
					
						2009-03-11 23:05:36 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							3a9657df5f 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb  
						
						
						
					 
					
						2009-03-11 22:02:31 +09:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							eb61313fcd 
							
						 
					 
					
						
						
							
							Remove debug message  
						
						
						
					 
					
						2009-03-11 22:01:43 +09:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							375c2555a2 
							
						 
					 
					
						
						
							
							still fixing convert_cards.. god i'm retarded lol  
						
						
						
					 
					
						2009-03-11 06:38:17 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							52db43cd6b 
							
						 
					 
					
						
						
							
							fix my further screwed up convert_cards function..  
						
						
						
					 
					
						2009-03-11 06:31:47 -04:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							b64c4f301e 
							
						 
					 
					
						
						
							
							action regex not so simple.  
						
						... 
						
						
						
						-really- need test_Everleaf to catch this sort of thing 
						
					 
					
						2009-03-11 01:46:46 +00:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							f45716e67e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						
						
					 
					
						2009-03-10 20:32:53 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							ffdf66b676 
							
						 
					 
					
						
						
							
							new cards file  
						
						
						
					 
					
						2009-03-10 20:31:09 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							f2a6c9c361 
							
						 
					 
					
						
						
							
							tell us what kind of database error happened if hud database errors  
						
						
						
					 
					
						2009-03-10 20:19:54 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							1653dcf34c 
							
						 
					 
					
						
						
							
							fix error i made in convertcards  
						
						
						
					 
					
						2009-03-10 20:19:33 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							388525ed30 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/Database.py 
						
					 
					
						2009-03-10 19:31:42 -04:00