]> git.sesse.net Git - kdenlive/commit
Merge branch 'master' into audioAlign
authorSimon A. Eugster <simon.eu@gmail.com>
Thu, 19 Apr 2012 09:33:54 +0000 (11:33 +0200)
committerSimon A. Eugster <simon.eu@gmail.com>
Thu, 19 Apr 2012 09:33:54 +0000 (11:33 +0200)
commitb4fef878fdcf0cfb2fb384a59fb2d1888f1d5f4e
treebcb499777ca4dbc7fb351163cebc8595bf8127dc
parentce68de86827a11cd0dc96465fba021b2f7ceea55
parent42a153d0adc5c3e5d6470202ba9ebc1044d6f2f6
Merge branch 'master' into audioAlign
src/customtrackview.cpp
src/customtrackview.h
src/definitions.h
src/mainwindow.cpp