Merge pull request #351 from pieh/partially_watched

author pieh <misiek.piechowiak@gmail.com>

Mon, 5 Sep 2011 20:15:54 +0000 (13:15 -0700)

committer pieh <misiek.piechowiak@gmail.com>

Mon, 5 Sep 2011 20:15:54 +0000 (13:15 -0700)
author pieh <misiek.piechowiak@gmail.com>
Mon, 5 Sep 2011 20:15:54 +0000 (13:15 -0700)
committer pieh <misiek.piechowiak@gmail.com>
Mon, 5 Sep 2011 20:15:54 +0000 (13:15 -0700)
diff --cc xbmc/GUIInfoManager.cpp
Simple merge
diff --cc xbmc/GUIInfoManager.h
Simple merge
author	pieh <misiek.piechowiak@gmail.com>
	Mon, 5 Sep 2011 20:15:54 +0000 (13:15 -0700)
committer	pieh <misiek.piechowiak@gmail.com>
	Mon, 5 Sep 2011 20:15:54 +0000 (13:15 -0700)
		1	2
xbmc/GUIInfoManager.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/GUIInfoManager.h	patch \|	diff1 \|	diff2 \|	blob \| history