diff options
author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-14 22:43:22 +0200 |
---|---|---|
committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-14 22:43:28 +0200 |
commit | af05e4b2defde537f3b953a7dae0ef44fae225aa (patch) | |
tree | 3f751014432b35df1cc2fd6fb976410e86b70e73 /src/inventory.cpp | |
parent | 4415d95c503f083d871abaf84516f2b6487ecb60 (diff) | |
parent | 81535f6277b66c869cda7125b2aeaf99e8078b92 (diff) | |
download | minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.tar.gz minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.tar.bz2 minetest-af05e4b2defde537f3b953a7dae0ef44fae225aa.zip |
Merge branch 'upstream/master'
Conflicts:
data/oerkki1.png
src/client.cpp
Diffstat (limited to 'src/inventory.cpp')
-rw-r--r-- | src/inventory.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index 0c76ed845..fec51a759 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "serverobject.h" #include "content_mapnode.h" #include "content_inventory.h" +#include "content_sao.h" /* InventoryItem |