summaryrefslogtreecommitdiff
path: root/src/clientobject.cpp
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-16 16:52:45 +0200
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-16 16:52:45 +0200
commit014a3aea3257aadf53e50bcedd4d2da148bafea2 (patch)
treee84fdfd731ac14fa17c017cf403b04704b51cee5 /src/clientobject.cpp
parent5086bd5664a0b7d60ed8aae757bf0312d9f159e4 (diff)
parentafa2b8714f2e5dcbc45099c9a9418b25bfcc097f (diff)
downloadminetest-014a3aea3257aadf53e50bcedd4d2da148bafea2.tar.gz
minetest-014a3aea3257aadf53e50bcedd4d2da148bafea2.tar.bz2
minetest-014a3aea3257aadf53e50bcedd4d2da148bafea2.zip
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'src/clientobject.cpp')
-rw-r--r--src/clientobject.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index 787efef29..bec9f46fd 100644
--- a/src/clientobject.cpp
+++ b/src/clientobject.cpp
@@ -26,8 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
ClientActiveObject
*/
-core::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
-
ClientActiveObject::ClientActiveObject(u16 id):
ActiveObject(id)
{