diff options
author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/content_nodemeta.h | |
parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz |
Merge branch 'master' into master
Diffstat (limited to 'src/content_nodemeta.h')
-rw-r--r-- | src/content_nodemeta.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/content_nodemeta.h b/src/content_nodemeta.h index 92a9bd546..b853274f5 100644 --- a/src/content_nodemeta.h +++ b/src/content_nodemeta.h @@ -29,5 +29,6 @@ class IItemDefManager; Legacy nodemeta definitions */ -void content_nodemeta_deserialize_legacy(std::istream &is, NodeMetadataList *meta, - NodeTimerList *timers, IItemDefManager *item_def_mgr); +void content_nodemeta_deserialize_legacy(std::istream &is, + NodeMetadataList *meta, NodeTimerList *timers, + IItemDefManager *item_def_mgr); |