summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2012-01-18 10:01:12 +0200
committerPetri Hintukainen <phintuka@users.sourceforge.net>2012-01-18 10:01:12 +0200
commitcb6e4b4ffd49cdef83c6d025f175cf6a79705fc8 (patch)
tree12b50ef5e4cdfa5710b0f4d21b25b19e61e2030f /debian
parentecbf41ae10616d6e16befe9e47c3979248776dd9 (diff)
parent4d1d566f57c427cd8c009dc68fa9e7fcacc31427 (diff)
downloadxine-lib-cb6e4b4ffd49cdef83c6d025f175cf6a79705fc8.tar.gz
xine-lib-cb6e4b4ffd49cdef83c6d025f175cf6a79705fc8.tar.bz2
Merge from 1.1
--HG-- rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
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 2fb49aeb4..c0506849f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,11 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low
-- Darren Salt <linux@youmustbejoking.demon.co.uk> Thu, 29 Jul 2010 18:57:56 +0100
-xine-lib (1.1.19+hg-0) unstable; urgency=low
+xine-lib (1.1.21~hg-0) unstable; urgency=low
* Hg snapshot (dev build). Changelog is irrelevant :-)
- -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 27 Jul 2010 17:55:16 +0100
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Jan 2012 19:06:22 +0000
xine-lib (1.1.5~cvs-0) unstable; urgency=low