Emil Axelsson 5ced910f79 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management ...

Conflicts:
	include/openspace/scene/scenegraphnode.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/interactionmode.cpp

2017-07-18 10:54:41 +02:00

..

ext/libtorrent

Feature/packaging (#333)

2017-07-01 14:04:37 -04:00

images

Add initial version of launcher

2015-06-08 01:08:58 +02:00

CMakeLists.txt

Use icon for Launcher

2017-07-01 17:53:23 -04:00

files.qrc

Add initial version of launcher

2015-06-08 01:08:58 +02:00

infowidget.cpp

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

infowidget.h

More include guard fixes

2017-02-09 22:20:17 -05:00

main.cpp

Change tab to spaces

2017-05-19 12:15:39 -06:00

mainwindow.cpp

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-07-18 10:54:41 +02:00

mainwindow.h

Cleanup Launcher config comments, unecessary changes, etc.

2017-05-19 12:08:55 -06:00

openspace.ico

Use icon for Launcher

2017-07-01 17:53:23 -04:00

openspace.png

Use icon for Launcher

2017-07-01 17:53:23 -04:00

openspace.rc

Use icon for Launcher

2017-07-01 17:53:23 -04:00

shortcutwidget.cpp

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

shortcutwidget.h

More include guard fixes

2017-02-09 22:20:17 -05:00

syncwidget.cpp

Loading and unloading assets

2017-07-06 22:33:11 +02:00

syncwidget.h

More include guard fixes

2017-02-09 22:20:17 -05:00