]> git.sesse.net Git - kdenlive/commit
Merge branch 'master' into audioAlign
authorSimon A. Eugster <simon.eu@gmail.com>
Fri, 13 Apr 2012 09:32:46 +0000 (11:32 +0200)
committerSimon A. Eugster <simon.eu@gmail.com>
Fri, 13 Apr 2012 09:32:46 +0000 (11:32 +0200)
commitce68de86827a11cd0dc96465fba021b2f7ceea55
tree6fe7e0c719727d3a3d544829181437cb924aeb8c
parent6621953e0aa7c5a5b255d3daaf11b19f3279335d
parentecb64dc146c7c9043d3f4884d906b08707fcbba5
Merge branch 'master' into audioAlign

Conflicts:
mindmap.svg
src/CMakeLists.txt
src/audioscopes/CMakeLists.txt
src/audioscopes/ffttools.cpp
src/audioscopes/ffttools.h
src/lib/audio/fftTools.cpp
src/lib/audio/fftTools.h
src/scopes/audioscopes/ffttools.cpp
src/scopes/audioscopes/ffttools.h
13 files changed:
mindmap.svg
src/CMakeLists.txt
src/clipitem.h
src/customtrackview.cpp
src/customtrackview.h
src/definitions.h
src/mainwindow.cpp
src/mainwindow.h
src/renderer.cpp
src/scopes/audioscopes/CMakeLists.txt
src/scopes/audioscopes/audiospectrum.cpp
src/scopes/audioscopes/audiospectrum.h
src/scopes/audioscopes/spectrogram.h