summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-04-17 16:53:33 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-04-17 16:53:33 +0100
commit0bbc4497a72dca89f178349b76fca6ea92bbf17f (patch)
tree03b7528f8507c2f86beed9f9a9e6149ceaa27f23 /debian/changelog
parent7604f551c91343371d13cd10fd66ab8c09208ff6 (diff)
parent931ca6f5fea6b53dee5bf3131dc0e46199425038 (diff)
downloadxine-lib-0bbc4497a72dca89f178349b76fca6ea92bbf17f.tar.gz
xine-lib-0bbc4497a72dca89f178349b76fca6ea92bbf17f.tar.bz2
Merge from 1.1 (and update the debian/changelog datestamp for 1.2.0~hg).
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog8
1 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index b2d25a3ce..640044a8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,13 @@ xine-lib (1.2.0~hg-0) unstable; urgency=low
* Hg snapshot.
* Adjust for libxine2.
- -- Darren Salt <linux@youmustbejoking.demon.co.uk> Sat, 14 Apr 2007 16:31:58 +0100
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Apr 2007 16:50:37 +0100
+
+xine-lib (1.1.6~hg-0) unstable; urgency=low
+
+ * Hg snapshot.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Mon, 16 Apr 2007 22:00:07 +0100
xine-lib (1.1.5~cvs-0) unstable; urgency=low