Merge pull request #7 from og01/master

author Lars Op den Kamp <opdenkamp@gmail.com>

Fri, 2 Dec 2011 10:52:42 +0000 (02:52 -0800)

committer Lars Op den Kamp <opdenkamp@gmail.com>

Fri, 2 Dec 2011 10:52:42 +0000 (02:52 -0800)
author Lars Op den Kamp <opdenkamp@gmail.com>
Fri, 2 Dec 2011 10:52:42 +0000 (02:52 -0800)
committer Lars Op den Kamp <opdenkamp@gmail.com>
Fri, 2 Dec 2011 10:52:42 +0000 (02:52 -0800)
diff --cc include/cecc.h
Simple merge
diff --cc src/lib/LibCECC.cpp
Simple merge
author	Lars Op den Kamp <opdenkamp@gmail.com>
	Fri, 2 Dec 2011 10:52:42 +0000 (02:52 -0800)
committer	Lars Op den Kamp <opdenkamp@gmail.com>
	Fri, 2 Dec 2011 10:52:42 +0000 (02:52 -0800)
		1	2
include/cecc.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/LibCECC.cpp	patch \|	diff1 \|	diff2 \|	blob \| history