Matthew Territo 92f55f24d6 Merge remote-tracking branch 'origin/master' into feature/launcherconfigs ...

# Conflicts:
#	ext/sgct
#	openspace.cfg

2017-05-12 15:40:06 -06:00

..

Launcher

Merge commit 'd94940e6d2b0a5a8de390eee107d4dcf5e91ad72' into feature/launcherconfigs

2017-02-20 08:39:49 -07:00

OpenSpace

Remove warnings on MacOS in Clang

2017-04-25 19:12:42 -04:00

TaskRunner

Update branch to work with changes in develop

2017-03-02 18:53:03 +01:00

TimelineView

Updated check_style_guide to test for include guards and copyright

2017-02-09 23:55:39 -05:00