Merge pull request #158 from sergiud/zero-allocation

author Shinichiro Hamaji <shinichiro.hamaji@gmail.com>

Thu, 6 Jul 2017 05:58:37 +0000 (14:58 +0900)

committer GitHub <noreply@github.com>

Thu, 6 Jul 2017 05:58:37 +0000 (14:58 +0900)
author Shinichiro Hamaji <shinichiro.hamaji@gmail.com>
Thu, 6 Jul 2017 05:58:37 +0000 (14:58 +0900)
committer GitHub <noreply@github.com>
Thu, 6 Jul 2017 05:58:37 +0000 (14:58 +0900)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/glog/logging.h.in
Simple merge
diff --cc src/logging.cc
Simple merge
diff --cc src/logging_unittest.cc
Simple merge
author	Shinichiro Hamaji <shinichiro.hamaji@gmail.com>
	Thu, 6 Jul 2017 05:58:37 +0000 (14:58 +0900)
committer	GitHub <noreply@github.com>
	Thu, 6 Jul 2017 05:58:37 +0000 (14:58 +0900)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/glog/logging.h.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/logging.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/logging_unittest.cc	patch \|	diff1 \|	diff2 \|	blob \| history