Skip to content
Commit f26e82ab authored by Thomas Friedrichsmeier's avatar Thomas Friedrichsmeier
Browse files

Merge branch 'master' into frameworks 

Conflicts:
	rkward/plugin/rkvarselector.cpp
parents 1b0c0610 e9fea33e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment