Skip to content
GitLab
Explore
Sign in
Multimedia
Kdenlive
Commits
b8684fb2
Commit
b8684fb2
authored
Oct 31, 2012
by
Ed Rogalsky
Browse files
Merge branch 'master' into feature/pkey
Conflicts: src/mainwindow.h
parents
09194484
bf5a5fef
Changes
21
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