From: Ed Rogalsky <ed.rogalsky@googlemail.com>
Date: Wed, 31 Oct 2012 06:56:55 +0000 (+0100)
Subject: Merge branch 'master' into feature/pkey
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b8684fb22577d9e5b19944d814840187690b51c2;p=kdenlive

Merge branch 'master' into feature/pkey

Conflicts:
	src/mainwindow.h
---

b8684fb22577d9e5b19944d814840187690b51c2
diff --cc src/mainwindow.h
index 67f31ea1,9efa6e4c..db1cbc22
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@@ -567,9 -567,7 +567,9 @@@ private slots
      /** @brief Save current timeline clip as mlt playlist. */
      void slotSaveTimelineClip();
      /** @brief Process keyframe data sent from a clip to effect / transition stack. */
-     void slotProcessImportKeyframes(GRAPHICSRECTITEM type, const QString& data);
+     void slotProcessImportKeyframes(GRAPHICSRECTITEM type, const QString& data, int maximum);
 +    /** @brief Move playhead to mouse curser position if defined key is pressed */
 +    void slotAlignPlayheadToMousePos();
  
  signals:
      Q_SCRIPTABLE void abortRenderJob(const QString &url);