[DSPlayer] fixed: missing merged revisions
authorblinkseb <blinkseb@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 22 Oct 2010 18:13:43 +0000 (18:13 +0000)
committerblinkseb <blinkseb@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 22 Oct 2010 18:13:43 +0000 (18:13 +0000)
commit6447ed6597fb40b1bd96133d6a1a83c0f33cee1b
tree93b9225aa58aabf4dbdb26872ee6c1691e728405
parent2ad22e2861603bacda84718fe9b1a6165f5cb784
[DSPlayer] fixed: missing merged revisions

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/dsplayer@34948 568bbfeb-2a22-0410-94d2-cc84cf5bfa90