[mythtv-commits] mythtv/master commit: e433387b1 by Gavin Hurlbut (Beirdo)

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-08-08T21:22:12-07:00
   Push Date:  2011/08/08 21:22:41 -0700
  Repository:  mythtv
      Branch:  master
New Revision:  e433387b141d13feb034801d0cd37a4cc877e347
   Changeset:  https://github.com/MythTV/mythtv/commit/e433387b1

Log:

Merge branch 'win32' of https://github.com/jmartens/mythtv into master

Fixes #9969

Conflicts:
	mythtv/libs/libmythbase/mythcommandlineparser.cpp
	mythtv/libs/libmythupnp/upnpcds.cpp

Modified:

   mythplugins/configure
   mythtv/configure