[mythtv-firehose] mythtv/master commit: 6202c0d15 by Jim Stichnoth (stichnot)

[MythTV]

      Author:  Jim Stichnoth <jstichnoth at mythtv.org>
 Change Date:  2012-02-29T15:48:22-08:00
   Push Date:  2012/02/29 15:49:12 -0800
  Repository:  mythtv
      Branch:  master
New Revision:  6202c0d156c3e09eeeb050902468390495ae291d
   Changeset:  https://github.com/MythTV/mythtv/commit/6202c0d15

Log:

Revert "Subtitles: Remove the OSDSubFont setting."

This reverts commit 25fe663161784a1738496c8ab584d71e66cb85a5.

The OSDSubFont setting will be replaced with a new setting called
DefaultSubtitleFont with a default value of FreeMono.

Modified:

   mythtv/libs/libmythtv/subtitlescreen.cpp
   mythtv/libs/libmythtv/teletextscreen.cpp
   mythtv/programs/mythfrontend/globalsettings.cpp