Skip to content
Commit 136fdcdf authored by Michael Pyne's avatar Michael Pyne
Browse files

Merge remote-tracking branch 'origin/master' into make_it_mojo 

Still passes revised test suite.

Conflicts:
	modules/ksb/Application.pm
	modules/ksb/BuildSystem/CMake.pm
parents ab9d2c9c 5eefe52a
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