[mythtv-commits] mythtv branch fixes/0.26 updated by jstichnoth. v0.26.1-30-ge41b710

[Git Repo Owner]

The branch, fixes/0.26 has been updated on the
mythtv repository by gitolite user jstichnoth.
       via  e41b710244cbf38a86f2bdb7b64345b015711260 (commit)
       via  3f328b6955a462ed111bb05fbb2e4f4cc5a79005 (commit)
      from  3beccab801cf380d553cd13be815231e489ba83f (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 e41b710244cbf38a86f2bdb7b64345b015711260
Author:    Jim Stichnoth <jstichnoth at mythtv.org> at Sat, 21 Dec 2013 22:03:45 -0800
Committer: Jim Stichnoth <jstichnoth at mythtv.org> at Sat, 21 Dec 2013 22:03:45 -0800
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=e41b710244cbf38a86f2bdb7b64345b015711260

Update binary version after 3f328b6955a462ed111bb05fbb2e4f4cc5a79005.



commit 3f328b6955a462ed111bb05fbb2e4f4cc5a79005
Author:    Jim Stichnoth <jstichnoth at mythtv.org> at Sat, 21 Dec 2013 21:14:49 -0800
Committer: Jim Stichnoth <jstichnoth at mythtv.org> at Sat, 21 Dec 2013 22:00:33 -0800
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=3f328b6955a462ed111bb05fbb2e4f4cc5a79005

Be less aggressive about clearing the bookmark on exit.
Refs #7994.  We shouldn't automatically clear the bookmark at the end
of the recording if the "Clear bookmark on playback" setting is false.
(cherry picked from commit 670cb2d55c36f57ca056babccef1d99ae4c4bad0)

Conflicts:

	mythtv/libs/libmythtv/tv_play.cpp
(cherry picked from commit 525ac31dd2215e5ce46fc3b70f7ba883d99b736a)



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

Summary of changes:
 mythtv/libs/libmythbase/mythversion.h |    2 +-
 mythtv/libs/libmythtv/tv_play.cpp     |   41 ++++++++++++++++++++++++++------
 mythtv/libs/libmythtv/tv_play.h       |    1 +
 3 files changed, 35 insertions(+), 9 deletions(-)

--