don't use special special sort episode/season members as episode/season number
fixes #14281
[confluence] update episode/season labels to better handle empty season infolabel
don't depend on special sort epsiode/season when formatting label and update season/episode format to be more in line with values returned by infomanager
Linux: fix handling of zombie processes
no need to manually set the display resolution anymore
CDisplaySettings: improve screen options filler to determine the current screen
settings: make sure videoscreen.screen/resolution change if videoscreen.screenmode is changed
settings: add OnSettingPropertyChanged callback to ISettingCallback
settings: add IsEnabled() to CSetting
settings: move dependency logic from CGUIWindowSettingsCategory to CSettingsManager
CDisplaySettings: don't show a prompt when switching from/to windowed mode
remove unused methods from CSettings
pvr: fix channel switch for addons using other stream
Add artist level to CD Audio rip path

PR made as requested in http://forum.xbmc.org/showthread.php?tid=164044
Merge pull request #2768 from Tolriq/rippath

Add artist level to CD Audio rip path
[win32] cosmetic change in WIN32Util.h
[win32] always use IPv4 sockets on WinXP (because it doesn't support dual-stack IPv4 and IPv6 sockets through IPV6_V6ONLY)
[WIN32] fixed: delete vs created stuff as well on prepare-env
Remove double decoding code introduced by a2f0c6db3500e50052d102e75eaeec7bd5a2b449.
Merge pull request #2771 from ulion/remove_not_used_decoding_code

Remove double decoding code introduced by a2f0c6db3500e50052d102e75eaeec7bd5a2b449