[mythtv-commits] mythtv branch master updated by gigem. v0.26-pre-288-g7aebf8c

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user gigem.
       via  7aebf8caa18f22fdc7ccf48d6b0130deb6e175ca (commit)
       via  8a279eb1d6032804f72aca7722f363992749e905 (commit)
      from  abfced82a94d2644d1c4df3e332458e947092329 (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 7aebf8caa18f22fdc7ccf48d6b0130deb6e175ca
Author:    David Engel <dengel at mythtv.org> at Tue, 15 May 2012 09:51:55 -0500
Committer: David Engel <dengel at mythtv.org> at Tue, 15 May 2012 09:51:55 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=7aebf8caa18f22fdc7ccf48d6b0130deb6e175ca

Fix updating of metadata info in RecordingRule.
Only set the metadata info from the RecordingInfo if it's not already
set.  This is should be a better fix than was commited in db123034.



commit 8a279eb1d6032804f72aca7722f363992749e905
Author:    David Engel <dengel at mythtv.org> at Tue, 15 May 2012 09:51:10 -0500
Committer: David Engel <dengel at mythtv.org> at Tue, 15 May 2012 09:51:10 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8a279eb1d6032804f72aca7722f363992749e905

Revert "Fix editing inetref/season/episode from the PBB."
This reverts commit db123034e322be6af5104063b044933693ad2d25.

Conflicts:

	mythtv/programs/mythfrontend/scheduleeditor.cpp



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

Summary of changes:
 mythtv/libs/libmythtv/recordingrule.cpp         |   10 +++++--
 mythtv/programs/mythfrontend/scheduleeditor.cpp |   28 ++++++----------------
 2 files changed, 15 insertions(+), 23 deletions(-)

--