sync with v0.9 branch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de88633b5650195160f19e955373e43cad6a5972..d0e99d2f2cc7409f5335d0490416bb075584488a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,10 +2,10 @@ project(kdenlive)
 
 # An odd patch version number means development version, while an even one means
 # stable release. An additional number can be used for bugfix-only releases.
-set(KDENLIVE_VERSION 0.9.5)
+set(KDENLIVE_VERSION 0.9.7)
 
 # Minimum versions of main dependencies.
-set(LIBMLT_MIN_VERSION 0.8.6)
+set(LIBMLT_MIN_VERSION 0.8.8)
 set(QT_MIN_VERSION 4.5.0)
 set(KDE_MIN_VERSION 4.3.0)
 

diff --git a/ChangeLog b/ChangeLog
index 88fe10a388cb77591b32b07d45fe988d1582b805..c71ffcc325e8d2e240f0b80a9fe9ece531479edb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+0.9.6
+    * Fix keyframes when cutting a clip / undoing a clip cut
+    * Warn before overwriting .mlt stabilized file
+    * Fix monitor confusion (clip monitor sometimes playing timeline,...)
+    * Fix the Mono to Stereo effect UI
+    * Fix proxy of playlist having wrong aspect ratio in some locales
+    * Fix transition widget not correctly updated when resizing a transition
+    * Fix DVD chapters broken when using an intro movie
+    * Fix error message (No matching profile) poping up in render widget when everything was ok
+    * Fix clip keyframes not showing on project load
+    * Fix bug when moving guide (was not moving to the correct place)
+    * Fix project corruption (wrong character) caused by some clip's metadata
+    * Fix possible crash on track deletion
+    * Fix timeline corruption when using spacer tool or overwrite edit mode
+    * Fix possible crash when editing speed effect
+    * Fix transition losing all its properties when moved
+    * Fix crash when pressing del when editing animation in title widget
+    * Fix crash when doing quick clip resize
+    * Fix corruption when groups where overlapping
+    * Fix corruption when adding a title clip where a transition already existed
+    * Fix timeline preview corruption with some transitions
+
 0.9.4
     * Fix color parameter in some effects not working correctly (#2644)
     * Fix V4l licensing issue (#2632)

diff --git a/README b/README
index 14a5023b12743d7a2e261cc11a383c80fe49d610..d9fdefea8b16be445acaaf2702824ef4ddc26f14 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Kdenlive 0.9.4
+Kdenlive 0.9.6
 by Jean-Baptiste Mardelle <jb@kdenlive.org> and the Kdenlive team
 
 Kdenlive is a video editing application based on KDE Platform 4.

diff --git a/src/wizard.cpp b/src/wizard.cpp
index 410101b6e07df3401646d709e8cb7d9a4b0d2180..f0c6120c320714a56466a7a0ffeaa51ad6d189f9 100644 (file)
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -49,7 +49,7 @@
 // Recommended MLT version
 const int mltVersionMajor = 0;
 const int mltVersionMinor = 8;
-const int mltVersionRevision = 0;
+const int mltVersionRevision = 8;
 
 static const char kdenlive_version[] = VERSION;