Alexander Bock a2cad36772 Merge remote-tracking branch 'origin/feature/iSWA' into develop ...

Conflicts:
	data/scene/default.scene
	scripts/bind_keys.lua

2016-06-01 19:46:23 +02:00

..

engine

MemoryFile har now char pointer and size instead of string

2016-05-06 16:39:24 -04:00

interaction

untabify to make merge easier

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

network

untabify to make merge easier

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

properties

Remove cygnet groups

2016-05-03 17:13:28 -04:00

query

Name changes

2016-05-09 13:09:47 -04:00

rendering

Set attributes of screenspacerenderable through dictionary

2016-05-03 15:35:33 -04:00

scene

untabify to make merge easier

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

scripting

untabify to make merge easier

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

util

Histogram eq with group dataprocessor

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

openspace.h

Updating versioning number to prerelease-9 (IPS)

2016-05-31 18:26:20 +02:00