summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-03-03 22:27:25 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-03-03 22:27:25 +0000
commitd031764edb6050623f0e399be5a7cbc7bee76249 (patch)
tree5712270b75712ad067ecd7c8a807c483b8f0db4a /.hgtags
parentb4eea697942773917c2b4c8b932e246227ba01d4 (diff)
parentbc0969908f75c641469ab46e9866c3ee3026a435 (diff)
downloadxine-lib-d031764edb6050623f0e399be5a7cbc7bee76249.tar.gz
xine-lib-d031764edb6050623f0e399be5a7cbc7bee76249.tar.bz2
Merge from 1.1.
--HG-- rename : src/libmpeg2new/include/Makefile.am => src/video_dec/libmpeg2new/include/Makefile.am rename : src/libmpeg2new/libmpeg2/Makefile.am => src/video_dec/libmpeg2new/libmpeg2/Makefile.am
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index fedfb0905..7e1b9166e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -80,3 +80,4 @@ ffe7962edb79c2ed967b82a82ccfb2ac7eb148a2 vdr-xine-version-802
e33280bcaa3b1f3f5b93e633e2225e2440ecfd7c xine-lib-1_1_16-release
01fac0a015581bbdf7e38561ad2a95405e2ca785 xine-lib-1_1_16_1-release
ff19463729d8f9bbea35171d641c5f28cdacc7c8 xine-lib-1_1_16_2-release
+0c7de0050b8df535dfa76b933979f4fc58bde10e DEBIAN_xine-lib-1.2_1.2.0~hg-0