[mythtv-firehose] mythtv branch master updated by stuartm. v0.26-pre-512-gc9497cb

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user stuartm.
       via  c9497cb775f3dd77829bf426bbdff61074ee8819 (commit)
       via  67ef67bbb44e2cfddcacdf00d7c46719297e1b6b (commit)
      from  7d9bb76207b7d5fa4e5092261824196d43ad785d (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 c9497cb775f3dd77829bf426bbdff61074ee8819
Author:    Lawrence Rust <lvr at softsystem.co.uk> at Wed, 6 Jun 2012 13:55:18 +0100
Committer: Stuart Morgan <smorgan at mythtv.org> at Wed, 6 Jun 2012 13:55:18 +0100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=c9497cb775f3dd77829bf426bbdff61074ee8819

Fix incorrect deletion of a MythUIType object in MythUIButtonList::CopyFrom() which left an invalid pointer in the list of children. Refs #10807
Signed-off-by: Stuart Morgan <smorgan at mythtv.org>



commit 67ef67bbb44e2cfddcacdf00d7c46719297e1b6b
Author:    Stuart Morgan <smorgan at mythtv.org> at Wed, 6 Jun 2012 13:53:14 +0100
Committer: Stuart Morgan <smorgan at mythtv.org> at Wed, 6 Jun 2012 13:53:14 +0100
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=67ef67bbb44e2cfddcacdf00d7c46719297e1b6b

Replace concatenated string in MythControls::ResolveConflict().



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

Summary of changes:
 mythtv/libs/libmythui/mythuibuttonlist.cpp    |    4 +---
 mythtv/programs/mythfrontend/mythcontrols.cpp |   11 +++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

--