Merge pull request #3238 from Memphiz/picturefade
authorMemphiz <memphis@machzwo.de>
Tue, 1 Oct 2013 06:36:32 +0000 (23:36 -0700)
committerMemphiz <memphis@machzwo.de>
Tue, 1 Oct 2013 06:36:32 +0000 (23:36 -0700)
[picture] - don't calculate a fadein/out based on the slideshow display ...

1  2 
xbmc/pictures/SlideShowPicture.cpp

Simple merge