[mythtv-commits] mythtv commits

[mythtv at ijr.dnsalias.org]

----------------------------------------------------------------------------
Changes committed by ijr on Thu Apr 17 11:13:23 2003

Modified Files:
   in mythweb:
        conflicts.php functions.php menustrip.php 
Log Message:
Updated conflict resolution patch by Panix.

----------------------------------------------------------------------------