mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 17:30:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/video-on-globe

Browse Source 
# Conflicts:
#	modules/globebrowsing/src/layergroupid.h
#	modules/globebrowsing/src/tileprovider/tileprovider.cpp
This commit is contained in:
Ylva Selling
2023-02-09 12:55:08 -05:00
parent 6935cc571f 90250d7099
commit 70fd239418
1553 changed files with 6679 additions and 10483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/src/layer.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 *