[xine-lib/el6: 63/63] Merge branch 'f19' into el6

[Rex Dieter]

commit e4448964c67d2fea0d3c513e943ae71821f9d44b
Merge: 53f040d da58f27
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Aug 26 15:26:01 2014 -0500

    Merge branch 'f19' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	xine-lib-mk-autotools-patch.sh
    	xine-lib.spec

 .gitignore                         |    7 +-
 sources                            |    3 +-
 xine-lib-1.1.1-deepbind-939.patch  |   20 --
 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-mk-autotools-patch.sh     |   34 ----
 xine-lib.spec                      |  354 +++++++++++++++++++++++-------------
 9 files changed, 294 insertions(+), 203 deletions(-)
---