Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

diff --cc src/framework/mlt_playlist.c
index 3a03b1bd938b368b068e085911dd8f9ccf74c407,8339169bfc5a41193cf02e9d71b3c1faf8afdc37..94c4d418eb293806efe2d263429991cbca699f12
--- 1/src/framework/mlt_playlist.c
--- 2/src/framework/mlt_playlist.c
+++ b/src/framework/mlt_playlist.c
@@@ -1688,13 -1689,14 +1688,13 @@@ int mlt_playlist_remove_region( mlt_pla
  
                if ( clip_start < position )
                {
 -                      mlt_playlist_split( this, index ++, position - clip_start );
 -                      clip_length -= position - clip_start;
 +                      mlt_playlist_split( this, index ++, position - clip_start - 1 );
                }
  
-               while( length > 0 )
+               while( length >= 0 )
                {
                        if ( mlt_playlist_clip_length( this, index ) > length )
 -                              mlt_playlist_split( this, index, length );
 +                              mlt_playlist_split( this, index, length - 1 );
                        length -= mlt_playlist_clip_length( this, index );
                        mlt_playlist_remove( this, index );
                }

diff --cc src/modules/qimage/kdenlivetitle_wrapper.cpp
index 822df65d7c553db773ba5f5cc03160e4361333f4,77373e12adf15c09dfd9eacfa10780413366c63e..f71a73b526485803be1e85e4991923678b80de91
--- 1/src/modules/qimage/kdenlivetitle_wrapper.cpp
--- 2/src/modules/qimage/kdenlivetitle_wrapper.cpp
+++ b/src/modules/qimage/kdenlivetitle_wrapper.cpp
@@@ -17,9 -17,12 +17,16 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   */
  
+ #include "kdenlivetitle_wrapper.h"
+ #include <framework/mlt_producer.h>
+ 
  #include <QtGui/QImage>
  #include <QtGui/QPainter>
++<<<<<<< HEAD:src/modules/qimage/kdenlivetitle_wrapper.cpp
 +#include <QtCore/QCoreApplication>
++=======
+ #include <QtCore/QDebug>
++>>>>>>> jbm/kdenlivetitle:src/modules/qimage/kdenlivetitle_wrapper.cpp
  #include <QtGui/QApplication>
  #include <QtCore/QFile>
  #include <QtGui/QGraphicsScene>