summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-02-01 01:29:58 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-02-01 01:29:58 +0000
commit1e70919700fde382d13f28f023ed1fa08cddf49a (patch)
tree5382104078de65add6b99ef7189c0d81ff0dff48 /debian
parent9524b748a27734b4cdee2d348adfd0606abdedda (diff)
parent4c48996da5a13a135338e745157c45f351300540 (diff)
downloadxine-lib-1e70919700fde382d13f28f023ed1fa08cddf49a.tar.gz
xine-lib-1e70919700fde382d13f28f023ed1fa08cddf49a.tar.bz2
Merge from 1.1, discarding es.po changes.
--HG-- rename : misc/xine-config => misc/xine-config.in
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 2460b1267..803c3f72f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low
-- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Apr 2007 16:50:37 +0100
-xine-lib (1.1.10~hg-0) unstable; urgency=low
+xine-lib (1.1.10+hg-0) unstable; urgency=low
[ Darren Salt ]
* Hg snapshot.
@@ -14,7 +14,7 @@ xine-lib (1.1.10~hg-0) unstable; urgency=low
* remove gs from build-dependencies
* change the maintainer field to xine-devel@lists.sourceforge.net.
- -- Darren Salt <linux@youmustbejoking.demon.co.uk> Mon, 14 Jan 2008 22:57:42 +0000
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Sun, 27 Jan 2008 01:41:45 +0000
xine-lib (1.1.5~cvs-0) unstable; urgency=low