Kdenlive

kdenlive:feature/jack

  1. Git
  2. lp:kdenlive
  3. feature/jack
Last commit made on 2014-01-10
Get this branch:
git clone -b feature/jack https://git.launchpad.net/kdenlive

Branch merges

Branch information

Name:
feature/jack
Repository:
lp:kdenlive

Recent commits

46f72f6... by Ed Rogalsky <email address hidden>

minor post merge hacks

a237963... by Ed Rogalsky <email address hidden>

Merge branch 'master' into feature/jack

Conflicts:
 src/abstractclipitem.cpp
 src/abstractclipitem.h
 src/abstractgroupitem.cpp
 src/abstractgroupitem.h
 src/abstractmonitor.h
 src/archivewidget.cpp
 src/clipitem.cpp
 src/clipmanager.cpp
 src/clipproperties.cpp
 src/clipproperties.h
 src/clipstabilize.cpp
 src/clipstabilize.h
 src/commands/razorclipcommand.cpp
 src/commands/razorclipcommand.h
 src/customruler.cpp
 src/customtrackview.cpp
 src/customtrackview.h
 src/docclipbase.cpp
 src/docclipbase.h
 src/doubleparameterwidget.cpp
 src/dvdwizard.cpp
 src/dvdwizard.h
 src/dvdwizardchapters.cpp
 src/dvdwizardmenu.cpp
 src/dvdwizardmenu.h
 src/dvdwizardvob.cpp
 src/effectstack/collapsibleeffect.cpp
 src/graphicsscenerectmove.cpp
 src/jogshuttle.cpp
 src/kdenlive.desktop
 src/kdenlive.notifyrc
 src/kdenlivedoc.cpp
 src/kdenlivedoc.h
 src/keyframehelper.cpp
 src/mainwindow.cpp
 src/mainwindow.h
 src/markerdialog.cpp
 src/monitor.cpp
 src/monitor.h
 src/monitormanager.cpp
 src/monitormanager.h
 src/onmonitoritems/onmonitorcornersitem.cpp
 src/onmonitoritems/onmonitorrectitem.cpp
 src/projectlist.cpp
 src/projecttree/meltjob.h
 src/projecttree/proxyclipjob.cpp
 src/renderer.cpp
 src/renderer.h
 src/renderwidget.cpp
 src/renderwidget.h
 src/scopes/audioscopes/audiospectrum.cpp
 src/scopes/audioscopes/spectrogram.cpp
 src/titlewidget.cpp
 src/transition.cpp
 src/transitionsettings.cpp
 src/videoglwidget.cpp
 src/videoglwidget.h
 thumbnailer/westleypreview.desktop

58a394d... by Henrikki Almusa <email address hidden>

fix bug 3197 (screen region capture)

f4462e7... by Vincent PINON <email address hidden>

fix coverity 1134134 1134135 (div by 0)

5f2ae77... by Vincent PINON <email address hidden>

fix coverity 1134133 (dead code)

e83d052... by Vincent PINON <email address hidden>

fix coverity 709295

3c84498... by Vincent PINON <email address hidden>

fix coverity 709319

5d4e849... by Vincent PINON <email address hidden>

coverity fix

29ceabd... by Vincent PINON <email address hidden>

fix gcc warnings

ac8c991... by Montel Laurent <email address hidden>

Use QLatin1String