git.sesse.net Git - kdenlive/commit

]> git.sesse.net Git - kdenlive/commit

projects / kdenlive / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1ff54c0 9879c3d)

author	Alberto Villa <avilla@FreeBSD.org>
	Thu, 10 Nov 2011 00:48:51 +0000 (01:48 +0100)
committer	Alberto Villa <avilla@FreeBSD.org>
	Thu, 10 Nov 2011 00:48:51 +0000 (01:48 +0100)
commit	fd3954b6965b2bc81eeed9fadd40dbbf9607fa37
tree	55b8b03e9690bc1f2b5cca8003366cca0f667458	tree \| snapshot
parent	1ff54c07a83d6efaa82580e26fd97f6496178dc5	commit \| diff
parent	9879c3db8f24d2835319324944e053de76f3cdf4	commit \| diff

Merge branch 'master' into buildsystem

Conflicts:
CMakeLists.txt
po/CMakeLists.txt

src/kdenlivesettingsdialog.cpp	diff1 \|	diff2 \|	blob \| history
src/mainwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/monitor.cpp	diff1 \|	diff2 \|	blob \| history
src/projectlist.cpp	diff1 \|	diff2 \|	blob \| history
src/projectsettings.cpp	diff1 \|	diff2 \|	blob \| history
src/renderer.h	diff1 \|	diff2 \|	blob \| history
src/wizard.cpp	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.