Alexander Bock d628c1a667 Merge branch 'master' into feature/DU ...

# Conflicts:
#	data/scene/grids/grids.mod
#	ext/sgct

2017-10-17 17:09:37 -04:00

..

curl

Add new libCurl that supports SSL for new GIBS datasets

2017-04-03 15:53:56 -04:00

ghoul @ 9f9db85720

Merge branch 'master' into feature/DU

2017-10-17 17:09:37 -04:00

json

Update json library to latest version (#322)

2017-06-06 13:44:27 -04:00

sgct @ ee29d15894

Add support for OpenGL 4.6

2017-10-11 09:05:10 -04:00

spice @ 63e382ac76

Update submodules

2017-04-06 19:38:56 -04:00

vld

Making Visual Leak Detector work

2015-05-25 17:28:11 +02:00

tinythread.cpp

Normalize ALL the line endings (#361)

2017-07-13 12:08:47 -04:00

tinythread.h

Normalize ALL the line endings (#361)

2017-07-13 12:08:47 -04:00