Commit Graph

2 Commits

Author SHA1 Message Date
Naios
f25666375e Dep/CppFormat: Update cppformat to cppformat/cppformat@bf8636c959
* fixes detecting support of <initializer_list>
* fixes build on solaris

(cherry picked from commit e40a5bf0b1)
2015-03-18 20:12:20 +01:00
Carbenium
03176662d1 Merge pull request #14317 from Naios/typesafelog
Type safe logging
(cherry picked from commit cc0c9add5a)

Conflicts:
	src/server/bnetserver/CMakeLists.txt
	src/server/game/Server/WorldSocketMgr.cpp
	src/server/shared/Logging/AppenderDB.cpp
	src/server/worldserver/CMakeLists.txt
2015-03-18 02:59:40 +01:00