diff options
author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 18:53:54 +0200 |
---|---|---|
committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-30 18:55:43 +0200 |
commit | 4ef9c7675ada82961d83601712a47ebad78b67b5 (patch) | |
tree | cdfd863219a8dc1031e727740e7d895296c5855d /src/materials.h | |
parent | f69123050b62ada635751b7155bb6822b0a97a9b (diff) | |
parent | dbea511a6f877450cfd5adb86efa55a8f00cc9a1 (diff) | |
download | minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.tar.gz minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.tar.bz2 minetest-4ef9c7675ada82961d83601712a47ebad78b67b5.zip |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'src/materials.h')
-rw-r--r-- | src/materials.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/materials.h b/src/materials.h index f061ecbfa..1439df194 100644 --- a/src/materials.h +++ b/src/materials.h @@ -97,7 +97,7 @@ private: }; // For getting the default properties, set tool="" -DiggingProperties getDiggingProperties(u8 material, const std::string &tool); +DiggingProperties getDiggingProperties(u16 material, const std::string &tool); #endif |