Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							69ece6eeba 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://repo.or.cz/fpbd-bostik  
						
						
						
					 
					
						2009-10-28 00:20:26 +08:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							e829ec56ef 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-10-27 11:43:55 -04:00 
						 
				 
			
				
					
						
							
							
								unknown 
							
						 
					 
					
						
						
						
						
							
						
						
							269bc0b7a3 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz.git  
						
						
						
					 
					
						2009-10-27 11:05:31 -04:00 
						 
				 
			
				
					
						
							
							
								unknown 
							
						 
					 
					
						
						
						
						
							
						
						
							7bd7b5b053 
							
						 
					 
					
						
						
							
							add todo to remind me  
						
						
						
					 
					
						2009-10-27 11:01:45 -04:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							fe53e8c8a7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into good  
						
						
						
					 
					
						2009-10-27 15:28:40 +02:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							15980877dd 
							
						 
					 
					
						
						
							
							Typofix in status icon load  
						
						
						
					 
					
						2009-10-27 15:28:11 +02:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							e25e4cf9b3 
							
						 
					 
					
						
						
							
							Use custom tray icon instead of GTK stock  
						
						... 
						
						
						
						Use the "Anonymous Cards" image from openclipart.org
(http://openclipart.org/media/files/Anonymous/12230 )
This same image is used in other new FPDB icons, but the combinations
with looking-glass don't look good in systray. This icon is plain enough
to work properly even when scaled really small. 
						
					 
					
						2009-10-27 15:24:49 +02:00 
						 
				 
			
				
					
						
							
							
								fpdb-mme 
							
						 
					 
					
						
						
						
						
							
						
						
							e732b74956 
							
						 
					 
					
						
						
							
							too many changes to remember  
						
						... 
						
						
						
						Signed-off-by: fpdb-mme <jUrner@arcor.de> 
						
					 
					
						2009-10-27 11:04:24 +01:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							998c80b7d0 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-10-27 08:45:58 +00:00 
						 
				 
			
				
					
						
							
							
								fpdb-mme 
							
						 
					 
					
						
						
						
						
							
						
						
							30103c5cb2 
							
						 
					 
					
						
						
							
							second try...  
						
						... 
						
						
						
						Signed-off-by: fpdb-mme <jUrner@arcor.de> 
						
					 
					
						2009-10-27 09:01:06 +01:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							2be3ab8897 
							
						 
					 
					
						
						
							
							Add Stars icon to folder  
						
						
						
					 
					
						2009-10-27 13:18:51 +08:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							879506cee4 
							
						 
					 
					
						
						
							
							Merge branch 'master' into good  
						
						
						
					 
					
						2009-10-27 06:26:25 +02:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							cba416e27a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools  
						
						
						
					 
					
						2009-10-27 06:26:04 +02:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							ca8182c37d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into good  
						
						
						
					 
					
						2009-10-27 06:08:19 +02:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							fcaa1030b6 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://trac-git.assembla.com/fpdb-sql  
						
						
						
					 
					
						2009-10-27 05:53:47 +02:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							dabbcc2d47 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-10-27 05:49:59 +02:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							ef39f5858e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-sql  
						
						
						
					 
					
						2009-10-27 11:40:18 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							9144c7ae68 
							
						 
					 
					
						
						
							
							Revert "Merge branch 'master' of git://git.assembla.com/fpdb-mme"  
						
						... 
						
						
						
						This reverts commit 1f07fa9a14 
						
					 
					
						2009-10-27 11:28:27 +08:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							d2cf8e9bc9 
							
						 
					 
					
						
						
							
							attempt at making system tray icon go away when quitting  
						
						
						
					 
					
						2009-10-26 22:26:22 +00:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							fabec1604a 
							
						 
					 
					
						
						
							
							stop warnings when importing from fpdb.py  
						
						
						
					 
					
						2009-10-26 21:59:41 +00:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							6b280d7db9 
							
						 
					 
					
						
						
							
							stop warning message from set_cell_data_func  
						
						
						
					 
					
						2009-10-26 21:38:04 +00:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							da64e336d7 
							
						 
					 
					
						
						
							
							allow sorts on both grids  
						
						
						
					 
					
						2009-10-26 21:12:57 +00:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							0ac559a2db 
							
						 
					 
					
						
						
							
							Add a comment to a comment.  
						
						
						
					 
					
						2009-10-26 16:50:17 -04:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							3435cb106e 
							
						 
					 
					
						
						
							
							Bump version to 0.12 in packaging  
						
						
						
					 
					
						2009-10-26 17:49:37 +02:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							fd31ecc0bf 
							
						 
					 
					
						
						
							
							Minor problem with rogue merge info in HHC.py.  
						
						
						
					 
					
						2009-10-26 11:19:44 -04:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							7b6581de7d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into good  
						
						
						
					 
					
						2009-10-26 17:09:06 +02:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							6b7b46754c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://repo.or.cz/fpbd-bostik  
						
						
						
					 
					
						2009-10-26 23:00:08 +08:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							35b24fa002 
							
						 
					 
					
						
						
							
							Remove a stray conflict marker  
						
						
						
					 
					
						2009-10-26 16:53:18 +02:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							14115b759e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-eric  
						
						
						
					 
					
						2009-10-26 10:10:05 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							9d42b46459 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-sql  
						
						
						
					 
					
						2009-10-26 10:09:57 -04:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							27fa27f370 
							
						 
					 
					
						
						
							
							GTK signal handlers need to return True/False  
						
						... 
						
						
						
						Since we deal with minimize/expose/show/hide routines ourselves, we
don't want these signals passed any further.
NOTE: if no return type is specified, it is automatically None which
usually is translated to False. That might trigger some weird behaviour,
up to and including rare and hard to reproduce GTK crashes. 
						
					 
					
						2009-10-26 13:29:32 +02:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							bb6b2ab9a2 
							
						 
					 
					
						
						
							
							Fix session timestamp range  
						
						... 
						
						
						
						PostgreSQL does automatic argument conversion/formatting when dealing
with timestamps. This simplification allows the session stats to be
generated with PostgreSQL as db backend. 
						
					 
					
						2009-10-26 12:55:23 +02:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							73262e808c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-10-26 12:18:37 +02:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							70426a70a0 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-eric  
						
						
						
					 
					
						2009-10-26 12:12:56 +02:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							9360bd6894 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-sql  
						
						
						
					 
					
						2009-10-26 17:27:29 +08:00 
						 
				 
			
				
					
						
							
							
								unknown 
							
						 
					 
					
						
						
						
						
							
						
						
							22b3d5de7f 
							
						 
					 
					
						
						
							
							should minimize to tray in windows. windows 7's tray doesn't like it much, but it'll get over it for now  
						
						
						
					 
					
						2009-10-26 05:03:25 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							115c44e7b1 
							
						 
					 
					
						
						
							
							Move session stats query into SQL.py  
						
						
						
					 
					
						2009-10-26 16:39:37 +08:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							a87bcbb43a 
							
						 
					 
					
						
						
							
							allow sort on all cols, tidy up some more details  
						
						
						
					 
					
						2009-10-26 08:38:45 +00:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							e0c193b77d 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-eric  
						
						
						
					 
					
						2009-10-26 14:41:11 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							1f07fa9a14 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-mme  
						
						... 
						
						
						
						Conflicts:
	docs/tabledesign.html
	pyfpdb/CarbonToFpdb.py
	pyfpdb/Configuration.py
	pyfpdb/Database.py
	pyfpdb/EverleafToFpdb.py
	pyfpdb/FpdbSQLQueries.py
	pyfpdb/GuiAutoImport.py
	pyfpdb/GuiBulkImport.py
	pyfpdb/GuiGraphViewer.py
	pyfpdb/GuiPlayerStats.py
	pyfpdb/GuiTableViewer.py
	pyfpdb/HUD_config.xml.example
	pyfpdb/HUD_main.py
	pyfpdb/HandHistoryConverter.py
	pyfpdb/Hud.py
	pyfpdb/Mucked.py
	pyfpdb/SQL.py
	pyfpdb/Stats.py
	pyfpdb/Tables.py
	pyfpdb/fpdb.py
	pyfpdb/fpdb_db.py
	pyfpdb/fpdb_import.py
	pyfpdb/fpdb_parse_logic.py
	pyfpdb/fpdb_simple.py
	pyfpdb/upd_indexes.sql 
						
					 
					
						2009-10-26 14:40:11 +08:00 
						 
				 
			
				
					
						
							
							
								unknown 
							
						 
					 
					
						
						
						
						
							
						
						
							f15bb627c0 
							
						 
					 
					
						
						
							
							add trayicon, minimize to tray by default (doesn't work quite right on windows)  
						
						
						
					 
					
						2009-10-26 01:36:29 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							71eb683a3d 
							
						 
					 
					
						
						
							
							Make cash cols sortable.  
						
						... 
						
						
						
						After sqlcoders effort this appears to work 
						
					 
					
						2009-10-26 12:16:20 +08:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							69b3c5a339 
							
						 
					 
					
						
						
							
							improve sorting but still not quite working right  
						
						
						
					 
					
						2009-10-26 00:33:33 +00:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							1dda03fda0 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-10-25 21:40:55 +02:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							0b049a128b 
							
						 
					 
					
						
						
							
							Make green in PlayerStats darker  
						
						
						
					 
					
						2009-10-25 20:51:46 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							73e8544117 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-sql  
						
						
						
					 
					
						2009-10-25 20:49:39 +08:00 
						 
				 
			
				
					
						
							
							
								unknown 
							
						 
					 
					
						
						
						
						
							
						
						
							0a084d1110 
							
						 
					 
					
						
						
							
							remove try..finally block in HUD_update idle_func function, move return to after the threads_leave() call, HUD now works in Win 7  
						
						
						
					 
					
						2009-10-25 08:27:55 -04:00 
						 
				 
			
				
					
						
							
							
								unknown 
							
						 
					 
					
						
						
						
						
							
						
						
							3b54fab9e0 
							
						 
					 
					
						
						
							
							remove the exception handler in kill_hud() i think sqlcoder put it in - it doesn't help because the exception isn't a python exception, it's a GTK exception.  (looks like a bug in GTK.. not that they'll ever acknowledge anything)  
						
						
						
					 
					
						2009-10-25 07:34:07 -04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							aff69287ff 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-10-25 14:23:08 +03:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							b4200f9f51 
							
						 
					 
					
						
						
							
							Tiny fix  
						
						
						
					 
					
						2009-10-25 14:22:49 +03:00