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

Merge branch 'master' into frameworks 

Conflicts:
	rkward/core/robjectlist.cpp
	rkward/misc/CMakeLists.txt
	rkward/misc/rkobjectlistview.cpp
	rkward/windows/robjectbrowser.cpp
parents 3363e3d3 02fdab6f
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