[mythtv-commits] mythtv branch master updated by stuartm. v0.28-pre-593-g9f931f4

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user stuartm.
       via  9f931f4f55438649994667cd1a923487e8528fc7 (commit)
      from  d013e5426fac8c654159cfb12467da55106b5e4b (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 9f931f4f55438649994667cd1a923487e8528fc7
Author:    Stuart Morgan <smorgan at mythtv.org> at Thu, 5 Dec 2013 10:20:37 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Thu, 5 Dec 2013 10:20:37 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=9f931f4f55438649994667cd1a923487e8528fc7

Services: Allow conflicts list to be filtered by recording rule



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

Summary of changes:
 mythtv/html/tv/upcoming.qsp                        |    6 +++---
 .../libmythservicecontracts/services/dvrServices.h |    5 +++--
 mythtv/programs/mythbackend/services/dvr.cpp       |    9 +++++++--
 mythtv/programs/mythbackend/services/dvr.h         |    8 +++++---
 4 files changed, 18 insertions(+), 10 deletions(-)

--