mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-25 14:29:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/tileproviders

Browse Source 
# Conflicts:
#	ext/ghoul
#	modules/globebrowsing/src/tileprovider.cpp
#	modules/globebrowsing/src/tileprovider.h
This commit is contained in:
Alexander Bock
2022-01-01 12:34:42 +01:00
parent 60b2f1b78b d7d279ea16
commit cdac4942b6
1252 changed files with 1253 additions and 1253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/globebrowsing/globebrowsingmodule.cpp
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2021 *
* Copyright (c) 2014-2022 *
* *
* 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 *