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

..

rotation.h

More coding style conformance

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

scale.h

More coding style conformance

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

scene.h

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

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

scenegraphnode.h

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

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

scenelicense.h

Cleanup for coding style

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

scenelicensewriter.h

Cleanup for coding style

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

sceneloader.h

More coding style conformance

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

scenemanager.h

Fix byte order mark commits

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

translation.h

More coding style conformance

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