diff options
author | Weblate <42@minetest.ru> | 2013-04-22 22:37:16 +0200 |
---|---|---|
committer | Weblate <42@minetest.ru> | 2013-04-22 22:37:16 +0200 |
commit | 418c2e7a446f8f0aca9f8bd23005a5896869ef7e (patch) | |
tree | 8c5e67eb5bc538174e768002c5419e86600c0623 /src/emerge.cpp | |
parent | 4117ab473bcc393f6081277df96dd27c898c90ad (diff) | |
parent | 58ded5cd27dd6e5ba740b22d8a3b0917f3d98150 (diff) | |
download | minetest-418c2e7a446f8f0aca9f8bd23005a5896869ef7e.tar.gz minetest-418c2e7a446f8f0aca9f8bd23005a5896869ef7e.tar.bz2 minetest-418c2e7a446f8f0aca9f8bd23005a5896869ef7e.zip |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/emerge.cpp')
-rw-r--r-- | src/emerge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp index 049b3cc12..2d8b01819 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -50,7 +50,7 @@ with this program; if not, write to the Free Software Foundation, Inc., EmergeManager::EmergeManager(IGameDef *gamedef) { //register built-in mapgens registerMapgen("v6", new MapgenFactoryV6()); - //registerMapgen("v7", new MapgenFactoryV7()); + registerMapgen("v7", new MapgenFactoryV7()); registerMapgen("indev", new MapgenFactoryIndev()); registerMapgen("singlenode", new MapgenFactorySinglenode()); |