merged: changes in trunk to rev 13718. Let's stick to committing to linuxport branch...
authorjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 24 Jun 2008 09:22:45 +0000 (09:22 +0000)
committerjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 24 Jun 2008 09:22:45 +0000 (09:22 +0000)
commita0fead32d19d24a5140965521b1b28156fe304ff
tree8c3b78f554bda555dc3d5cc1932f252a8b0a1515
parent603836a4b0fd103987e07a864dc5d8d7b4901538
merged: changes in trunk to rev 13718. Let's stick to committing to linuxport branch first, and then merge back to trunk as required.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC@13719 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
guilib/GUIControl.cpp
guilib/GUIControl.h
guilib/GUIControlGroup.cpp
guilib/GUIControlGroup.h
guilib/GUIWindow.cpp
guilib/guilib_win32.vcproj
xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp