[IOS] Always send swipe events, left the receiver to handle it or not.
dvdplayer: put line break into audio codec for consistency
Merge pull request #2480 from ulion/ios_swipe_fix

[IOS] [Fix] Always send swipe events, left the receiver to handle it or not.
depends: fix libgcrypt for some android/linux toolchains
Fixed: CAddon::HasSettings() was broken after a call to CAddon::SaveSettings() on creation of user settings
Merge pull request #2498 from FernetMenta/audiocodec

dvdplayer: put line break into audio codec for consistency
[jenkins] - welcome jenkins support for osx/ios/atv2/android to mainline :o) - add buildsteps for usage with jenkins
Delete settings category if it already exists in CSettingsGroup::AddCategory()
Guard against failed memory allocation in CGUIDialogVideoBookmarks::AddBookmark()
Let EventServer and other services using XBMC's Socket.h listen on IPv6 addresses.
Cosmetics: use PF_INET6 rather than AF_INET6 as arg for socket()
Revert "added logging to the hq-scaler determination"

This reverts commit 25cfad0c827f914327c885fa7eff5693386ec3bf.
Revert "Testing PR 2454 - LinuxRenderer: avoid double pass rendering if no scaling is done"

This reverts commit 2340a4aa67eca2a13a02fd32b33c8586e37a1c75.
Merge branch 'IPv6PR' into vdpau

* IPv6PR:
  Let EventServer and other services using XBMC's Socket.h listen on IPv6 addresses. Cosmetics: use PF_INET6 rather than AF_INET6 as arg for socket()
  Guard against failed memory allocation in CGUIDialogVideoBookmarks::AddBookmark()
  Delete settings category if it already exists in CSettingsGroup::AddCategory()
  [jenkins] - welcome jenkins support for osx/ios/atv2/android to mainline :o) - add buildsteps for usage with jenkins
  Fixed: CAddon::HasSettings() was broken after a call to CAddon::SaveSettings() on creation of user settings
  depends: fix libgcrypt for some android/linux toolchains
  dvdplayer: put line break into audio codec for consistency
  [IOS] Always send swipe events, left the receiver to handle it or not.

Conflicts:
	xbmc/network/Socket.cpp