Skip to content
GitLab
Explore
Sign in
Multimedia
Kdenlive
Commits
6563c7d7
Commit
6563c7d7
authored
Dec 31, 2012
by
Ed Rogalsky
Browse files
Merge remote-tracking branch 'origin/master' into feature/jack
Conflicts: src/monitor.cpp src/renderer.cpp
parents
af159d08
e2ba5297
Changes
25
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment