[mythtv] conflict resolution

[David Engel]

On Mon, Nov 03, 2003 at 12:12:17AM -0500, Isaac Richards wrote:
> I think that since you're actually taking the time to implement it, you should 
> pick =)

OK.

On Mon, Nov 03, 2003 at 12:53:48AM -0500, Matt Zimmerman wrote:
> There seem to be some things missing from your patch (like the database
> schema) and a few things that shouldn't be there (like the changes to
> settings.pro and the mythbackend/main.cpp changes).

I should have made it more clear the patch was not for anyone else to
actually apply.  As stated, it was just a proof of concept for testing
the scheduler.  For expample, the main.cpp change was so I could get
--printsched to work without affecting my production backend.

David
-- 
David Engel
dlengel at attbi.com