diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-16 18:25:55 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-16 18:25:55 +0200 |
| commit | 4263962e947b4914de8d1750f21cc7cc82567b4d (patch) | |
| tree | 32340098913c302fdb33f88ffea65fb36920db75 /src/resources/iteminfo.h | |
| parent | dd0844b6ac01293e7afd0dd85e695b8d77b8e4be (diff) | |
| parent | 7e2673a3b9460fdcd646e23c3bd9039de854565f (diff) | |
| download | mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.gz mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.bz2 mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.xz mana-4263962e947b4914de8d1750f21cc7cc82567b4d.zip | |
More merges and conflict resolves
Diffstat (limited to 'src/resources/iteminfo.h')
| -rw-r--r-- | src/resources/iteminfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 0c87b585..6c033490 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -24,7 +24,7 @@ #include "resources/spritedef.h" -#include "being.h" +#include "player.h" #include <map> #include <string> |