[mythtv-firehose] mythtv branch master updated by stuartm. v0.28-pre-2486-g82e0ca8

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user stuartm.
       via  82e0ca80616ffe1ba354082d96ca0e7a4e12af93 (commit)
      from  22736f994a9562f21e575d2a058253f76b42b63a (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 82e0ca80616ffe1ba354082d96ca0e7a4e12af93
Author:    Stuart Morgan <smorgan at mythtv.org> at Thu, 15 Jan 2015 16:27:47 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Thu, 15 Jan 2015 17:55:30 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=82e0ca80616ffe1ba354082d96ca0e7a4e12af93

CppCheck: Fix warning about duplicate declaration of inherited member in HtmlServerExtension.



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

Summary of changes:
 mythtv/libs/libmythupnp/htmlserver.cpp |   15 ++-------------
 mythtv/libs/libmythupnp/htmlserver.h   |    1 -
 mythtv/libs/libmythupnp/httpserver.cpp |    2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

--