mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 02:48:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into issue/2403

Browse Source 
# Conflicts:
#	modules/skybrowser/src/wwtcommunicator.cpp
This commit is contained in:
Ylva Selling
2023-01-04 11:19:54 -05:00
parent 29fe0e7975 4f4764209f
commit d03747324e
1316 changed files with 1460 additions and 1333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/skybrowser/skybrowsermodule.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2022 *
* Copyright (c) 2014-2023 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *