Skip to content
Snippets Groups Projects
Commit d4a50a21 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge remote-tracking branch 'newdev/master'

parents 849f80fe cf752d02
No related branches found
No related tags found
Loading
Showing with 170 additions and 211 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment