Michael Nilsson e8175ee54c solved merge conflict, fix for close(socket) in paralellconnection

2016-03-17 14:41:05 -04:00

..

engine

- Add currentDrawBufferResolution method in WindowWrapper

2016-02-09 10:46:51 +01:00

interaction

Updated copyright header

2016-02-05 17:43:21 +01:00

network

Updated copyright header

2016-02-05 17:43:21 +01:00

properties

Update ghoul to account for removed boost dependency

2016-03-15 23:59:57 +01:00

query

Updated copyright header

2016-02-05 17:43:21 +01:00

rendering

Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage

2016-03-16 17:42:13 -04:00

scene

Updated copyright header

2016-02-05 17:43:21 +01:00

scripting

Removing Jenkins warnings

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

util

Removing Jenkins warnings

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