Merge remote-tracking branch 'upstream/master'

author Tony <exocoder@gmail.com>

Tue, 8 Apr 2014 18:14:05 +0000 (19:14 +0100)

committer Tony <exocoder@gmail.com>

Tue, 8 Apr 2014 18:14:05 +0000 (19:14 +0100)
author Tony <exocoder@gmail.com>
Tue, 8 Apr 2014 18:14:05 +0000 (19:14 +0100)
committer Tony <exocoder@gmail.com>
Tue, 8 Apr 2014 18:14:05 +0000 (19:14 +0100)
diff --cc CMakeLists.txt
Simple merge
diff --cc cmake/templates/cvconfig.h.in
Simple merge
author	Tony <exocoder@gmail.com>
	Tue, 8 Apr 2014 18:14:05 +0000 (19:14 +0100)
committer	Tony <exocoder@gmail.com>
	Tue, 8 Apr 2014 18:14:05 +0000 (19:14 +0100)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
cmake/templates/cvconfig.h.in	patch \|	diff1 \|	diff2 \|	blob \| history