]> git.sesse.net Git - kdenlive/commitdiff
projects / kdenlive / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9be4b60 c52ef06)
Merge branch 'master' into next
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Wed, 9 Nov 2011 15:21:13 +0000 (16:21 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Wed, 9 Nov 2011 15:21:13 +0000 (16:21 +0100)
1  2 
src/monitor.cpp patch | diff1 | diff2 | blob | history

diff --cc src/monitor.cpp
Simple merge
Unnamed repository; edit this file 'description' to name the repository.