Merge remote-tracking branches 'origin/master' and 'samler/world' into Standalone

2020-04-17 15:03:00 +03:00 · 2020-04-17 15:03:00 +03:00 · 4ecf56a2d7
commit 4ecf56a2d7
parent b9c8ce0d37 fd229ed47e 2a4717fa41
3 changed files with 1114 additions and 1086 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
 [submodule "librw"]
 	path = librw
 	url = https://github.com/aap/librw
--- a/1
+++ b/1
@ -0,0 +1 @@
 Subproject commit 7bd6d4649e575e0a2a5f046fdf0d687cea87ca84
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
		`@ -0,0 +1 @@`
							`Subproject commit 7bd6d4649e575e0a2a5f046fdf0d687cea87ca84`