diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-16 08:04:19 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-16 08:04:23 +0100 |
| commit | 3890256fc57eafb2db83d328b8caf772188e21d4 (patch) | |
| tree | ee08a3acda5279a3bb331c0af569f1048b263fab /core/globals.cpp | |
| parent | b400c69cd487f70d8164dd5550eb994253d359d6 (diff) | |
Style: Cleanups, added headers, renamed files
Made sure files in core/ and tools/ have a proper Godot license header
when written by us. Also renamed aabb.{cpp,h} and object_type_db.{cpp,h}
to rect3.{cpp,h} and class_db.{cpp,h} respectively.
Also added a proper header to core/io/base64.{c,h} after clarifying
the licensing with the original author (public domain).
Diffstat (limited to 'core/globals.cpp')
| -rw-r--r-- | core/globals.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index 96daf55276..af3ec403d5 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -27,9 +27,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "globals.h" + #include "os/dir_access.h" #include "os/file_access.h" - #include "os/keyboard.h" #include "io/marshalls.h" #include "bind/core_bind.h" @@ -37,6 +37,7 @@ #include "io/file_access_pack.h" #include "io/file_access_network.h" #include "variant_parser.h" + GlobalConfig *GlobalConfig::singleton=NULL; GlobalConfig *GlobalConfig::get_singleton() { |