Merge pull request #2809 from jmarshallnz/no_skip_for_you
authorArne Morten Kvarving <spiff@xbmc.org>
Sat, 8 Jun 2013 08:51:45 +0000 (01:51 -0700)
committerArne Morten Kvarving <spiff@xbmc.org>
Sat, 8 Jun 2013 08:51:45 +0000 (01:51 -0700)
[dvd/omxplayer] don't override NextItem/PreviousItem with chapter skipping

1  2 
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/omxplayer/OMXPlayer.cpp

Simple merge
Simple merge