diff options
author | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
---|---|---|
committer | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
commit | a0566270d9fa075afa36a7e3e68c690b1b23ba90 (patch) | |
tree | 6bc88127ee67b7bf4d6a2d6f9d0a9e5f997d1dd1 /src/serverobject.h | |
parent | 0d83bdc3aa9f1077836aacb833ac4ad9bbb9a4f4 (diff) | |
parent | 1aa50b13622c1e264044839ecdf0152670dae6ce (diff) | |
download | minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.gz minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.bz2 minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.zip |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/serverobject.h')
-rw-r--r-- | src/serverobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serverobject.h b/src/serverobject.h index 6525270f6..7a5b47bd1 100644 --- a/src/serverobject.h +++ b/src/serverobject.h @@ -235,7 +235,7 @@ protected: private: // Used for creating objects based on type - static core::map<u16, Factory> m_types; + static std::map<u16, Factory> m_types; }; #endif |