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/Notification_Queue.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/Notification_Queue.h')
| -rw-r--r-- | dep/acelite/ace/Notification_Queue.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/dep/acelite/ace/Notification_Queue.h b/dep/acelite/ace/Notification_Queue.h index a9ad1ad245b..d312e0cd2c7 100644 --- a/dep/acelite/ace/Notification_Queue.h +++ b/dep/acelite/ace/Notification_Queue.h @@ -1,15 +1,16 @@ -#ifndef ACE_NOTIFICATION_QUEUE_H -#define ACE_NOTIFICATION_QUEUE_H - -#include /**/ "ace/pre.h" - /** * @file Notification_Queue.h * - * $Id: Notification_Queue.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Notification_Queue.h 95425 2012-01-09 11:09:43Z johnnyw $ * * @author Carlos O'Ryan <coryan@atdesk.com> */ + +#ifndef ACE_NOTIFICATION_QUEUE_H +#define ACE_NOTIFICATION_QUEUE_H + +#include /**/ "ace/pre.h" + #include "ace/Copy_Disabled.h" #include "ace/Event_Handler.h" #include "ace/Intrusive_List.h" |