diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-23 21:59:21 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-23 22:00:09 +0100 |
| commit | 99e8a3fd77b63a029fe02dcf771b6af1aad252ed (patch) | |
| tree | 03c296d1f89859aae35336dfe2f58df09d256fd3 /src/player_relations.h | |
| parent | fa8a4bf49100c0a1d5b96e00803f43bbbb861100 (diff) | |
| parent | 347452b9b69ef3af29c577b7751082822e900c01 (diff) | |
| download | mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.gz mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.bz2 mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.xz mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.zip | |
Merge branch 'aethyra/master'
Conflicts:
Many files.
Diffstat (limited to 'src/player_relations.h')
| -rw-r--r-- | src/player_relations.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/player_relations.h b/src/player_relations.h index dd363d41..a6c6a115 100644 --- a/src/player_relations.h +++ b/src/player_relations.h @@ -143,7 +143,6 @@ public: */ void removePlayer(const std::string &name); - /** * Retrieves the default permissions. */ @@ -154,8 +153,6 @@ public: */ void setDefault(unsigned int permissions); - - /** * Retrieves all known player ignore strategies. * |