diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-31 20:04:04 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-31 20:04:04 +0200 |
| commit | 7ece67727dcc1ff7a6634e4b911eeb82ed3eaf45 (patch) | |
| tree | b06cf63fb0c8d01f03c1fb84faa936197029e03f /src/inventory.h | |
| parent | 831003156c77c811e7f1fcb65811d1d099587442 (diff) | |
| parent | 303351de6d2cb54af27198207ba6c8cef49ecf1a (diff) | |
| download | minetest-7ece67727dcc1ff7a6634e4b911eeb82ed3eaf45.tar.gz minetest-7ece67727dcc1ff7a6634e4b911eeb82ed3eaf45.tar.bz2 minetest-7ece67727dcc1ff7a6634e4b911eeb82ed3eaf45.zip | |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'src/inventory.h')
| -rw-r--r-- | src/inventory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/inventory.h b/src/inventory.h index 66b1cd1f0..53495c6e5 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -136,7 +136,7 @@ public: virtual void serialize(std::ostream &os) { //os.imbue(std::locale("C")); - os<<getName(); + os<<"MaterialItem2"; os<<" "; os<<(unsigned int)m_content; os<<" "; |