Kalle Bladin 96c4f0e1c9 Solve merge conflict

2016-06-02 12:57:25 -04:00

..

engine

Rename Lua functions to preInitialization and postInitialization

2016-04-30 14:18:08 +02:00

interaction

Solve merge conflict

2016-06-02 12:57:25 -04:00

network

Untabify the rest of the source files

2016-04-18 20:14:29 +02:00

properties

Untabify the rest of the source files

2016-04-18 20:14:29 +02:00

query

Updated copyright header

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

rendering

Merged in branch develop to feature/globebrowsing

2016-04-18 20:02:42 -04:00

scene

Untabify the rest of the source files

2016-04-18 20:14:29 +02:00

scripting

Untabify the rest of the source files

2016-04-18 20:14:29 +02:00

util

Add explicit default constructor and copy constructor to class Time

2016-05-31 19:50:11 -04:00

openspace.h

Replacing CMake-based version setting with C++-based version

2016-04-14 10:27:59 -04:00