[mythtv-firehose] mythtv branch master updated by stuartm. v0.28-pre-2569-gb37699e

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user stuartm.
       via  b37699e5e7ab5ac113b21574a6a36558e9f41d07 (commit)
       via  d16845b4432bb5c15148d9d0085c95076b4e23cc (commit)
       via  b168ba340568851574f4772d49fc555352d195d1 (commit)
      from  b220116f77e782dd3cfb317a2152fbb9099699f1 (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 b37699e5e7ab5ac113b21574a6a36558e9f41d07
Author:    Stuart Morgan <smorgan at mythtv.org> at Thu, 29 Jan 2015 19:12:29 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Thu, 29 Jan 2015 20:49:49 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b37699e5e7ab5ac113b21574a6a36558e9f41d07

WebFrontend: Don't try to display channel icon if it doesn't exist



commit d16845b4432bb5c15148d9d0085c95076b4e23cc
Author:    Stuart Morgan <smorgan at mythtv.org> at Thu, 29 Jan 2015 18:46:45 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Thu, 29 Jan 2015 20:49:33 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=d16845b4432bb5c15148d9d0085c95076b4e23cc

WebFrontend: Partial fix for issue in the guide caused by programmes with overlapping timeslots.
The real fix needs to made at guide data insertion time.



commit b168ba340568851574f4772d49fc555352d195d1
Author:    Stuart Morgan <smorgan at mythtv.org> at Thu, 29 Jan 2015 17:56:51 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Thu, 29 Jan 2015 17:56:51 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b168ba340568851574f4772d49fc555352d195d1

Fix copy/paste error in documentation.



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

Summary of changes:
 mythtv/html/setup/js/channeleditor.js  |    2 +-
 mythtv/html/tv/css/guide.css           |    1 +
 mythtv/html/tv/css/schedule.css        |    2 +
 mythtv/html/tv/guide.qsp               |   25 +++++++++--
 mythtv/html/tv/images/channel_icon.svg |   76 ++++++++++++++++++++++++++++++++
 mythtv/html/tv/schedule.qsp            |   12 ++++-
 6 files changed, 110 insertions(+), 8 deletions(-)
 create mode 100644 mythtv/html/tv/images/channel_icon.svg

--