diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
| commit | 6568b0624dcd03243c70f9aa905b88422cb1e4c2 (patch) | |
| tree | 48ec6babfbfb2f9d255df568b659db9541d11054 /dep/acelite/ace/Remote_Tokens.h | |
| parent | e3add09fb7f8f3c425f6cb0e7611e4e2381bf88d (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_druid.cpp
Diffstat (limited to 'dep/acelite/ace/Remote_Tokens.h')
| -rw-r--r-- | dep/acelite/ace/Remote_Tokens.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dep/acelite/ace/Remote_Tokens.h b/dep/acelite/ace/Remote_Tokens.h index 3c9ed94f561..3d09f7f2fc4 100644 --- a/dep/acelite/ace/Remote_Tokens.h +++ b/dep/acelite/ace/Remote_Tokens.h @@ -4,7 +4,7 @@ /** * @file Remote_Tokens.h * - * $Id: Remote_Tokens.h 92345 2010-10-24 12:39:33Z johnnyw $ + * $Id: Remote_Tokens.h 93359 2011-02-11 11:33:12Z mcorino $ * * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) * @author Tim Harrison (harrison@cs.wustl.edu) @@ -42,7 +42,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * distributed token operations. It is similar to the * ACE_Token_Proxy. * @todo - * Distributed sleep_hooks have not been implemented. <owner_id> + * Distributed sleep_hooks have not been implemented. <owner_id> * is not implemented. */ class ACE_Export ACE_Remote_Token_Proxy : public ACE_Token_Proxy |