[SCM] vlc/master: Merge tag 'upstream/2.2.0_pre1'

[siretart at users.alioth.debian.org]

Imported Upstream version 2.2.0~pre1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3682a108d734a8a88918ca116106cd859a498d0b
X-Git-Newrev: 9942b17e8f6c4c7a67eeafd8eace3bbb1958843d

The following commit has been merged in the master branch:
commit 47be5b7ffc17fb0c26a3a47d69280a30a8a4a0b6
Merge: 3682a108d734a8a88918ca116106cd859a498d0b 8202ba9883e9ce11e125bd99041fcf0946006c7a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 16 18:36:38 2014 -0400

    Merge tag 'upstream/2.2.0_pre1'
    
    Upstream version 2.2.0~pre1
    
    Conflicts:
    	Makefile.in
    	bin/Makefile.in
    	compat/Makefile.in
    	config.h.in
    	configure
    	doc/Makefile.in
    	lib/Makefile.in
    	m4/Makefile.in
    	modules/Makefile.in
    	modules/access_output/Makefile.in
    	modules/audio_filter/Makefile.in
    	modules/control/Makefile.in
    	modules/gui/Makefile.in
    	modules/gui/ios_dialog_provider/Makefile.in
    	modules/gui/macosx/Makefile.in
    	modules/gui/macosx_dialog_provider/Makefile.in
    	modules/gui/minimal_macosx/Makefile.in
    	modules/gui/qt4/Makefile.in
    	modules/gui/skins2/Makefile.in
    	modules/hw/vdpau/Makefile.in
    	modules/misc/Makefile.in
    	modules/mux/Makefile.in
    	modules/packetizer/Makefile.in
    	modules/stream_out/Makefile.in
    	modules/text_renderer/Makefile.in
    	modules/video_filter/Makefile.in
    	modules/video_output/Makefile.in
    	modules/visualization/Makefile.in
    	share/Makefile.in
    	src/Makefile.in
    	test/Makefile.in


-- 
VLC media player packaging