diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-11-13 03:05:46 +0000 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-11-13 03:05:46 +0000 |
commit | aee4fbde84e1d7c06879415067d3625d01df0f36 (patch) | |
tree | 41bb778c4dbe132dd225bf499814cfb484b1fe3f | |
parent | 3d54887fc6fdba2413328d26fce3a96a4873ddb1 (diff) | |
parent | 4538c4edb85d38cf96a0bc85753663c1e4258817 (diff) | |
download | xine-lib-aee4fbde84e1d7c06879415067d3625d01df0f36.tar.gz xine-lib-aee4fbde84e1d7c06879415067d3625d01df0f36.tar.bz2 |
Merge from 1.1, discarding irrelevant po/* changes.
--HG--
rename : po/libxine1.pot => po/libxine2.pot
-rw-r--r-- | .hgtags | 1 | ||||
-rw-r--r-- | ChangeLog | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -159,3 +159,4 @@ ff764395a361257b11d73583a0e0851e0f5f2ee5 1.1.17 86395fcaded38aca33facf7c8263d23622eea2bd 1.1.18 8b7c25bfb056ee9b907877b462c132e61112e440 1.1.18.1 acba7a8c29cca74b112c2c6db4310ddeb1524696 1.1.19 +342128b2fcf59bfe8844b282a228581aa8bbbbde 1.1.20 @@ -70,7 +70,8 @@ xine-lib (1.1.90) (Unreleased) * Report more video output capabilities via (port)->get_capabilities(): colour controls, zooming, colour keying. -xine-lib (1.1.??) 2010-??-?? +xine-lib (1.1.20) 2011-11-13 + * Imagine that there's a large poppy here. * Ensure that file and socket descriptors are marked as CLOEXEC. * Enable FFmpeg's support for AAC LATM audio. * Fix build-time check for dvdnav. |