diff options
author | Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> | 2010-04-07 14:47:54 +0300 |
---|---|---|
committer | Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> | 2010-04-07 14:47:54 +0300 |
commit | 31d0fad9a33502e9c05e8862b0c3996bf8bafb93 (patch) | |
tree | 35bd7f5d963c3e900d007a91015e8bba0d9f3abd /debian | |
parent | d4cce391f9836996667067771e4ce9ca64d3fb3c (diff) | |
parent | 7bfa856f0673b81d4d0dafd6e02e07f10f07a023 (diff) |
Merge commit 'origin/master'
Conflicts:
libresourceqt/src/resource-engine.cpp
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 868f17f..0cc8956 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libresourceqt (1.4) unstable; urgency=low + + * libdbus-qeventloop fix + + -- Martin Wolf <ext-martin.2.wolf@nokia.com> Wed, 07 Apr 2010 13:00:00 +0200 + libresourceqt (1.3) unstable; urgency=low * Also Fixes: NB#161198 - Unable to hear audio from any other MAFW player process except for the qmafw-dbus-wrapper |