[mythtv] [PATCH] Updated MythWeb conflict resolution patch

[Panix]

These patches fix a bug where the conflict resolution would not work if the
conflicting show started prior to the other. Stupid mistake on my part but
fixed now.

This works on cvs as of 4-16-03 at 6:20PM CST.

It also includes the updates to the legends page as far as the window height
goes. Also has the menustrip option name changes and the removal of the
options that dont yet work. I just removed them for my own personal
preference, but not a big deal if they stay in really. The main thing is
fixing the bug in the conflict resolution code.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: menustrip.patch
Type: application/octet-stream
Size: 3672 bytes
Desc: not available
Url : /pipermail/attachments/20030416/a6ede145/menustrip.obj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: functions.patch
Type: application/octet-stream
Size: 2185 bytes
Desc: not available
Url : /pipermail/attachments/20030416/a6ede145/functions.obj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: conflicts.patch
Type: application/octet-stream
Size: 4860 bytes
Desc: not available
Url : /pipermail/attachments/20030416/a6ede145/conflicts.obj