[mythtv-commits] mythtv branch master updated by stuartm. v0.28-pre-1104-g19cf366

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user stuartm.
       via  19cf366d01fab857d236611251bcc5fac9076fbe (commit)
      from  38a953226d7279c1d059a60fc2a2fb7c56089f49 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 19cf366d01fab857d236611251bcc5fac9076fbe
Author:    Stuart Morgan <smorgan at mythtv.org> at Sun, 27 Apr 2014 20:27:49 +0100
Committer: Stuart Morgan <smorgan at mythtv.org> at Sun, 27 Apr 2014 20:27:49 +0100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=19cf366d01fab857d236611251bcc5fac9076fbe

Revert "Fix GuideGrid to include rsOtherShowing in the 'will record' highlighting colour. Fixes #12081"
This reverts commit 82b02823c4235b21f40a3722cef02e2387722f8f.

Until I re-write the frontend guide grid to match the WebFrontend
guide, this has the potential to cause more confusion that it would
solve. In the WebFrontend guide earlier/later/other showings get
highlighted in a completely different colour making it clear what will
be recorded, what won't be recorded (old episodes/duplicates) and what
will be recorded - just not at that time or on that channel.

Conflicts:
	mythtv/programs/mythfrontend/guidegrid.cpp



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

Summary of changes:
 mythtv/programs/mythfrontend/guidegrid.cpp |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

--