From kde-commits  Tue May 31 21:17:23 2016
From: Koos Vriezen <koos.vriezen () gmail ! com>
Date: Tue, 31 May 2016 21:17:23 +0000
To: kde-commits
Subject: [kmplayer/0.12] /: Merge remote-tracking branch 'origin/0.11' into 0.12
Message-Id: <E1b7r2R-0007Db-Gj () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=146472945115874

Git commit e1d22f819dfc120c6748e5ddac0308aabfc9e162 by Koos Vriezen.
Committed on 31/05/2016 at 21:16.
Pushed by vriezen into branch '0.12'.

Merge remote-tracking branch 'origin/0.11' into 0.12

Should be 0.12a here

M  +10   -3    ChangeLog
M  +1    -1    kmplayer.lsm

http://commits.kde.org/kmplayer/e1d22f819dfc120c6748e5ddac0308aabfc9e162

diff --cc ChangeLog
index 512422d,96e40dc..40e5a12
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,17 +1,17 @@@
- Changes since version 0.11.4
- - Port to kde5
- Changes since version 0.11.3d
 -Changes since version 0.11.5
++Changes since version 0.12.0
+ - Crash fix when okaying the configuration dialog
+ - Unpausing fix jumping to first item in list
+ - Compile fixes
 -Changes since version 0.11.4
+ - Rewrite big part of expression support
+ - Support animated SVG as far supported in Qt
+ - Crash fix in RealPix for img when img not found
+ - Crash fix in playlist DnD
 -Changes since version 0.11.3d
  - Port away from Qt3 support
  - Fix crash in playlist context menup move up/down
  - Fix possible XWindow leak when using MPlayer
  - Hardcode to shockwave flash for application/vnd.adobe.flash.movie mime
++Changes since version 0.11.3d
++- Port to kde5
  Changes since version 0.11.3c
  - Fix item activation in double click mode
  - Fix crash on plugin exit in MediaManager destructor
diff --cc kmplayer.lsm
index 1e82b60,3c33bec..3bf09a4
--- a/kmplayer.lsm
+++ b/kmplayer.lsm
@@@ -1,6 -1,6 +1,6 @@@
  Begin3
  Title:          Kmplayer
- Version:        0.12.0
 -Version:        0.11.5a
++Version:        0.12.0a
  Entered-date:   =

  Description:    =

  Keywords:       =20