Author: duncan Date: Mon Oct 23 13:21:09 2006 New Revision: 8456 Modified: branches/rel-1/freevo/freevo_config.py branches/rel-1/freevo/local_conf.py.example
Log: Merged differences from 1.6 Modified: branches/rel-1/freevo/freevo_config.py ============================================================================== --- branches/rel-1/freevo/freevo_config.py (original) +++ branches/rel-1/freevo/freevo_config.py Mon Oct 23 13:21:09 2006 @@ -1414,8 +1414,6 @@ TV_SETTINGS = '%s television %s %s' % (CONF.tv, CONF.chanlist, TV_DEVICE) -TV_CHANNEL_PROG = './chchan %(channel)s %(norm)s %(freqtable)s' - TV_DATEFORMAT = '%e-%b' # Day-Month: 11-Jun TV_TIMEFORMAT = '%H:%M' # Hour-Minute 14:05 TV_DATETIMEFORMAT = '%A %b %d %I:%M %p' # Thursday September 24 8:54 am Modified: branches/rel-1/freevo/local_conf.py.example ============================================================================== --- branches/rel-1/freevo/local_conf.py.example (original) +++ branches/rel-1/freevo/local_conf.py.example Mon Oct 23 13:21:09 2006 @@ -965,8 +965,6 @@ # TIMESHIFT_BUFFER = '%s/timeshift.mpeg' % FREEVO_CACHEDIR -# TV_CHANNEL_PROG = './chchan %(channel)s %(norm)s %(freqtable)s' - # TV_DATEFORMAT = '%e-%b' # Day-Month: 11-Jun # TV_TIMEFORMAT = '%H:%M' # Hour-Minute 14:05 # TV_DATETIMEFORMAT = '%A %b %d %I:%M %p' # Thursday September 24 8:54 am ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Freevo-cvslog mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
