diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-05 19:32:30 +0000 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-05 19:32:30 +0000 |
commit | 8626377b02b27a8e3f50ab37019bc623d1854bac (patch) | |
tree | 0c114fe88344caaf0a72e9a62f3dcf3e79043a13 | |
parent | 054a7a1300887eaa7c799d50248b68b57c7376b1 (diff) | |
parent | 313f40e217b55eb05de5d1b18637963a4656a707 (diff) | |
download | xine-lib-8626377b02b27a8e3f50ab37019bc623d1854bac.tar.gz xine-lib-8626377b02b27a8e3f50ab37019bc623d1854bac.tar.bz2 |
Merge.
--HG--
branch : 1.2.1-branch
-rw-r--r-- | .hgignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -43,7 +43,7 @@ autom4te.cache build-stamp configure-stamp debian/files -debian/libxine-dev +debian/libxine2-dev debian/libxine2 debian/libxine2-dbg debian/libxine2-doc |