[mythtv-commits] mythtv/master commit: d6e096872 by Nigel Pearson (NigelPearson)

[MythTV]

      Author:  Nigel Pearson <npearson at mythtv.org>
 Change Date:  2011-01-10T18:55:10-08:00
   Push Date:  2011/01/10 18:57:11 -0800
  Repository:  mythtv
      Branch:  master
New Revision:  d6e0968727f5edea1641c98e7d86e340a8c0d7a2
   Changeset:  https://github.com/MythTV/mythtv/commit/d6e096872

Log:

Merge branch 'master' of github.com:MythTV/mythtv

Conflicts:
	mythtv/libs/libmythui/mythdisplay.cpp

Modified:

   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythui/mythdisplay.cpp
   mythtv/libs/libmythui/mythdisplay.h
   mythtv/libs/libmythui/mythxdisplay.cpp
   mythtv/libs/libmythui/mythxdisplay.h