[xine-lib/f15: 14/14] Merge branch 'master' of ssh://pkgs.fedoraproject.org/xine-lib into f15

[Kevin Kofler]

commit e18cbe62a591f24a1c184b9ff292573f262df321
Merge: 5f8fd1a 838da37
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Fri Nov 25 22:42:23 2011 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/xine-lib into f15

 .gitignore                            |    1 +
 sources                               |    3 +-
 xine-lib-1.1.1-deepbind-939.patch     |   20 ----
 xine-lib-1.1.19-xvmclib_header.patch  |   11 --
 xine-lib-1.1.20-link-libdvdread.patch |   11 ++
 xine-lib-1.1.4-optflags.patch         |   11 --
 xine-lib-cleanup-sources.sh           |   14 ++-
 xine-lib-mk-autotools-patch.sh        |   34 ------
 xine-lib.spec                         |  192 ++++++++++-----------------------
 9 files changed, 78 insertions(+), 219 deletions(-)
---