Merge branch 'master' into makefile_overhaul

This commit is contained in:
Fred Sundvik
2016-08-25 23:26:02 +03:00
55 changed files with 2856 additions and 336 deletions

1
lib/googletest Submodule

Submodule lib/googletest added at ec44c6c167