ffmpeg-neon-1:2.3.3-1
libpng-neon-1.6.12-1
linux-odroid-xu-hybris-3.4.98-2
linux-odroid-xu-hybris-headers-3.4.98-2
pixman-neon-0.32.6-2
vlc-neon-2.1.5-1
x265-neon-1.3-1
xbmc-libhybris-gotham-hyb-1:13.2-1
xbmc-libhybris-gotham-mfc-1:13.2-1
fix Readme.md
Merge remote-tracking branch 'upstream/master'

Conflicts:
	linux-odroid-xu-hybris/PKGBUILD