Tleety f0ae365401 Merge remote-tracking branch 'origin/master' into Menu ...

# Conflicts:
#	src/Engine/Rendering/Texture.cpp
#	src/Game/Game.cpp

2016-02-11 14:43:30 +01:00

..

Licenses

Fixes for #34 (Licenses)

2016-01-15 17:20:11 +01:00

Schema

Merge remote-tracking branch 'origin/master' into Menu

2016-02-11 14:43:30 +01:00

Shaders

Merge remote-tracking branch 'origin/master' into Menu

2016-02-11 14:43:30 +01:00

DefaultConfig.ini

Used config for soundsystem properties.

2016-02-08 16:40:13 +01:00

DefaultInput.ini

Merge remote-tracking branch 'origin/master' into WeaponSystem

2016-02-10 17:02:00 +01:00