Resolve backport conflicts
Due to some GUI related elements in the OS X GUI being backported, and some not, we will have to solve these conflicts manually
Due to some GUI related elements in the OS X GUI being backported, and some not, we will have to solve these conflicts manually
VideoLAN code repository instance