aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Conditions/ConditionMgr.h
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2012-09-11 01:13:41 +0100
committerNay <dnpd.dd@gmail.com>2012-09-11 01:13:41 +0100
commitb1c4118a33f669f8be7131c7d37b34dbe63ff545 (patch)
tree468fdf51066947dd8254753ee98163be97d0d0b8 /src/server/game/Conditions/ConditionMgr.h
parentf237a57f51c0473bda90bae7a06bd5b9c187754b (diff)
parent8d049545de87595a84e6e2c54d7b44b354644144 (diff)
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.h')
-rwxr-xr-xsrc/server/game/Conditions/ConditionMgr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
index 130a23a0cb0..fcd0c788d9f 100755
--- a/src/server/game/Conditions/ConditionMgr.h
+++ b/src/server/game/Conditions/ConditionMgr.h
@@ -149,7 +149,7 @@ enum RelationType
enum
{
- MAX_CONDITION_TARGETS = 3,
+ MAX_CONDITION_TARGETS = 3
};
struct ConditionSourceInfo