diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:07:56 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:07:56 +0100 |
| commit | 22142fd2cc8dd262ca1202ffeb5f4ef714870c4c (patch) | |
| tree | ca0a1eaeb781baec2c4e5b22cf9df60fa89f2982 /src/common | |
| parent | 5bd0ddb6e2d1b002372541f911a2764ed2e54e6c (diff) | |
| parent | a5895b1655be3e81f451844a911eab8b798fa7ab (diff) | |
| download | manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.gz manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.xz manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.zip | |
Merge github.com:mana/manaserv
Conflicts:
src/game-server/character.cpp
src/scripting/lua.cpp
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/manaserv_protocol.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/common/manaserv_protocol.h b/src/common/manaserv_protocol.h index 4cca951..8946a39 100644 --- a/src/common/manaserv_protocol.h +++ b/src/common/manaserv_protocol.h @@ -433,8 +433,6 @@ enum BeingDirection /** * Beings Genders - * WARNING: Has to be in sync with the same enum in the Being class - * of the client! */ enum BeingGender { |