Merge branch 'cppformat' of https://github.com/gabime/spdlog into cppformat

Browse Source

Conflicts:
	include/spdlog/details/async_log_helper.h

...

This commit is contained in:

gabi 2014-12-03 00:38:38 +02:00

parent 3916674bc5 80d09d8309

commit 6fceaa8dab

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available