Kalle Bladin 012bcaefaf Solve merge conflicts.

2016-06-07 12:54:52 -04:00

..

blockplaneintersectiongeometry.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

boxgeometry.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

camera.h

Update camera to use double precition.

2016-06-05 21:27:20 -04:00

factorymanager.h

Removing Jenkins warnings

2016-02-05 23:28:45 +01:00

factorymanager.inl

More cleanup of FactoryManager

2015-12-14 17:55:24 -08:00

histogram.h

Histogram eq with group dataprocessor

2016-05-20 16:46:33 -04:00

keys.h

Enable the usage of modifiers in bindKey calls (closing #158)

2016-04-08 18:03:09 +02:00

mouse.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

openspacemodule.h

Removing Jenkins warnings

2016-02-05 23:28:45 +01:00

powerscaledcoordinate.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

powerscaledscalar.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

powerscaledsphere.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

progressbar.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00

screenlog.h

Refactor PerformanceLayout into new file and reuse between RenderEngine and GuiPerformanceComponent

2016-06-06 01:54:41 +02:00

spicemanager.h

Removing some cppcheck warnings

2016-04-14 22:49:03 -04:00

syncbuffer.h

Remove sgct.h inclusion from LuaConsole

2016-04-18 11:12:12 +02:00

time.h

Add more flexibility to construction of Time instances

2016-06-05 18:35:40 -04:00

transformationmanager.h

Add button to reset performance measurements

2016-06-06 10:23:28 +02:00

updatestructures.h

untabify to make merge easier

2016-04-20 15:21:30 -04:00