evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

premerge

Browse Source
This commit is contained in:
Matt Turnbull 2009-06-07 21:57:56 +01:00
parent 1a2d124b77
commit c1e4c083fe
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyfpdb/fpdb.py
View File

@ -427,12 +427,7 @@ class fpdb:
ps_tab=new_ps_thread.get_vbox() ps_tab=new_ps_thread.get_vbox()
self.add_and_display_tab(ps_tab, "Positional Stats") self.add_and_display_tab(ps_tab, "Positional Stats")
<<<<<<< HEAD:pyfpdb/fpdb.py
def tab_main_help(self, widget, data=None):
=======
def tab_main_help(self, widget, data): def tab_main_help(self, widget, data):
>>>>>>> f0b4d82fa554c678f5df0e847083fb8c3bbd0bfa:pyfpdb/fpdb.py
"""Displays a tab with the main fpdb help screen""" """Displays a tab with the main fpdb help screen"""
#print "start of tab_main_help" #print "start of tab_main_help"
mh_tab=gtk.Label("""Welcome to Fpdb! mh_tab=gtk.Label("""Welcome to Fpdb!