Update
Merge branch 'master' of https://github.com/X0rg/Arch-PKGs
Fix conflict with lib32-ffmpeg name and Git Raw