Alexander Bock f227767492 Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor ...

# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp

2017-11-12 10:50:11 -05:00

..

wrapper

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-09 22:49:07 -06:00

configurationmanager.h

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

2017-11-12 10:50:11 -05:00

downloadmanager.h

More coding style conformance

2017-11-11 11:25:49 -05:00

logfactory.h

Fix byte order mark commits

2017-07-17 15:54:00 -04:00

moduleengine.h

Add strict test for whitespace at end of line

2017-11-09 23:47:51 -05:00

openspaceengine.h

Merge branch 'master' into feature/loadingscreen-refactor

2017-11-09 22:49:07 -06:00

settingsengine.h

Cleanup for coding style

2017-11-08 10:35:39 -06:00

syncengine.h

Add strict test for whitespace at end of line

2017-11-09 23:47:51 -05:00

virtualpropertymanager.h

Feature/virtualproperty (#286)

2017-04-13 14:38:28 -04:00