Merge commits accidentally reverted during the code-reshuffle merge, fixes #11134
authorJonathan Marshall <jmarshall@never.you.mind>
Thu, 17 Feb 2011 01:13:42 +0000 (14:13 +1300)
committerJonathan Marshall <jmarshall@never.you.mind>
Thu, 17 Feb 2011 01:14:01 +0000 (14:14 +1300)
commit2f1da34b62271259f372d63aa6131de1ade494b3
treef98bb7b9cfd684f68b2e888d56cc80aaa023c537
parent33ceb935f29c55ae0150c86337685c01288bfab1
parent03ec412bed3dc58530f1f34e45eeb33288e34d9a
Merge commits accidentally reverted during the code-reshuffle merge, fixes #11134
xbmc/guilib/GUIBaseContainer.cpp
xbmc/guilib/GUIListContainer.cpp