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/client/content_cso.h | |
parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz |
Merge branch 'master' into master
Diffstat (limited to 'src/client/content_cso.h')
-rw-r--r-- | src/client/content_cso.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/content_cso.h b/src/client/content_cso.h index ccdb00610..cc9213175 100644 --- a/src/client/content_cso.h +++ b/src/client/content_cso.h @@ -22,5 +22,5 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes_extrabloated.h" #include "clientsimpleobject.h" -ClientSimpleObject *createSmokePuff( - scene::ISceneManager *smgr, ClientEnvironment *env, v3f pos, v2f size); +ClientSimpleObject* createSmokePuff(scene::ISceneManager *smgr, + ClientEnvironment *env, v3f pos, v2f size); |