summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-10-13 00:30:37 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-10-13 00:30:37 +0100
commit9c92484c911e0f3d401a0230c90c4bcf40b84c05 (patch)
tree4248cd1333a272bde1d21b598ea1108f186dd050 /debian
parent9063eb601ef82bb5a43faf2cc07ab87af9fd8977 (diff)
parent574282f24812a9cfac7f120e08115b29362f44fa (diff)
downloadxine-lib-9c92484c911e0f3d401a0230c90c4bcf40b84c05.tar.gz
xine-lib-9c92484c911e0f3d401a0230c90c4bcf40b84c05.tar.bz2
Merge from 1.1.
--HG-- rename : src/xine-engine/buffer.h => include/xine/buffer.h
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 8e4eb98a9..0ceb2d890 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.14~hg-0) unstable; urgency=low
+xine-lib (1.1.16~hg-0) unstable; urgency=low
[ Darren Salt ]
* Hg snapshot.
@@ -14,7 +14,7 @@ xine-lib (1.1.14~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> Thu, 26 Jun 2008 20:32:42 +0100
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Fri, 15 Aug 2008 18:24:52 +0100
xine-lib (1.1.5~cvs-0) unstable; urgency=low