move the new 'auto login' string to the xbmc language file
Merge pull request #2596 from ronie/autologin

move the new 'auto login' string to the xbmc language file
Merge pull request #2554 from FlyingRat/ffmpeg-n1.2

[FFmpeg] version bump to n1.2 (rev e820e3a)
Only override episode/season numbers if the file name has them
Merge pull request #2590 from ScudLee/Date-based_Nfo_fix

Only override episode/season numbers if the file name has them
encoder: signed vs unsigned warning
dvdplayer: sub_id in ffmpeg has been depreciated and doesn't work
gas-preprocessor/-arch switch, missed one in ceab8eb9b70f7af17850350cb3af9ce328ae5609
[gui] added colordiffuse attribute on texture definition
[WIN32] fixed buildsetup syntax error. The code looks absolute correct to me but windows didn't liked it somehow.
[WIN32] fixed: use sh shell for jenkins mode.
[WIN32] fixed: missing headers
[WIN32] fixed: if we get someday ffmpeg compiled properly, enable hw acceleration
[m3u8/airplay] - strip off any url options before checking for m3u8 filename - fixes stream quality selection (e.x. for airplay ^^)
Merge pull request #2605 from Memphiz/fixm3u8selection

[m3u8/airplay] - strip off any url options before checking for m3u8 file...
Revert "[m3u8/airplay] - strip off any url options before checking for m3u8 filename - fixes stream quality selection (e.x. for airplay ^^)"

This reverts commit ad51187dcab53ea2850a5d9c6f6caada405733e1.
[m3u8/airplay] - strip off any url options before checking for m3u8 filename - fixes stream quality selection (e.x. for airplay ^^) - right way this time
fix episode smartplaylists (fixes #14267)
smartplaylists: disable grouping for episodes
Merge pull request #2606 from Montellese/xsp_episode_fixes

Two fixes for episode smartplaylists