Merge branch 'master' of /srv/git.sesse.net/www/cubemap

author Steinar H. Gunderson <sgunderson@bigfoot.com>

Sun, 21 Apr 2013 11:56:03 +0000 (13:56 +0200)

committer Steinar H. Gunderson <sgunderson@bigfoot.com>

Sun, 21 Apr 2013 11:56:03 +0000 (13:56 +0200)
author Steinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 21 Apr 2013 11:56:03 +0000 (13:56 +0200)
committer Steinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 21 Apr 2013 11:56:03 +0000 (13:56 +0200)
diff --cc serverpool.cpp
Simple merge
diff --cc stream.cpp
Simple merge
diff --cc thread.cpp
Simple merge
author	Steinar H. Gunderson <sgunderson@bigfoot.com>
	Sun, 21 Apr 2013 11:56:03 +0000 (13:56 +0200)
committer	Steinar H. Gunderson <sgunderson@bigfoot.com>
	Sun, 21 Apr 2013 11:56:03 +0000 (13:56 +0200)
		1	2
serverpool.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
stream.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
thread.cpp	patch \|	diff1 \|	diff2 \|	blob \| history