[xine-lib/el5: 153/153] Merge branch 'el6' into el5

[Rex Dieter]

commit 59c6e57f671de86d95c507440a571064234bd1d2
Merge: a3304f7 e444896
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Aug 26 15:29:18 2014 -0500

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	branch
    	sources
    	xine-lib-1.1.4-optflags.patch
    	xine-lib-cleanup-sources.sh
    	xine-lib.spec

 .gitignore                                         |    7 +-
 sources                                            |    3 +-
 xine-lib-1.1.1-deepbind-939.patch                  |   20 -
 xine-lib-1.1.16-old-caca.patch                     |   27 --
 xine-lib-1.1.16.3-mod_mimetypes_typo.patch         |   20 -
 ...hack.patch => xine-lib-1.1.17-avsync_hack.patch |   14 +-
 xine-lib-1.1.19-no_autopoint.patch                 |   17 +
 xine-lib-1.1.21-samba4.patch                       |   32 ++
 xine-lib-1.1.4-optflags.patch                      |   11 -
 xine-lib-cleanup-sources.sh                        |   19 +-
 xine-lib-safe-audio-pause3.patch                   |  132 ------
 xine-lib.spec                                      |  457 +++++++++++++-------
 12 files changed, 370 insertions(+), 389 deletions(-)
---