Commit 08a1153e authored by Ivan Shynkarenka's avatar Ivan Shynkarenka

Merge branch 'master' of https://github.com/chronoxor/spdlog

Conflicts:
	example/bench.cpp
parents 38501649 e301d94a
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment