Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/shared/Logging/Appender.h
	src/server/worldserver/worldserver.conf.dist
This commit is contained in:
Nay committed 2012-08-15 21:14:21 +01:00
commit 9fcaeda097
8 files changed
+329 -20

No files matched your search

+1 -1
View File
@@ -170,7 +170,7 @@ LoginDatabase.WorkerThreads = 1
# 5 - (Error)
# 6 - (Fatal)
#
# Flags: Default Console = 6, File = 7, DB = 0
# Flags:
# 0 - None
# 1 - Prefix Timestamp to the text
# 2 - Prefix Log Level to the text