Merge branch 'buildsystem' into next

author Alberto Villa <avilla@FreeBSD.org>

Wed, 9 Nov 2011 01:10:17 +0000 (02:10 +0100)

committer Alberto Villa <avilla@FreeBSD.org>

Wed, 9 Nov 2011 01:10:17 +0000 (02:10 +0100)
author Alberto Villa <avilla@FreeBSD.org>
Wed, 9 Nov 2011 01:10:17 +0000 (02:10 +0100)
committer Alberto Villa <avilla@FreeBSD.org>
Wed, 9 Nov 2011 01:10:17 +0000 (02:10 +0100)
diff --cc src/mainwindow.cpp
Simple merge
diff --cc src/monitor.cpp
Simple merge
diff --cc src/projectlist.cpp
Simple merge
author	Alberto Villa <avilla@FreeBSD.org>
	Wed, 9 Nov 2011 01:10:17 +0000 (02:10 +0100)
committer	Alberto Villa <avilla@FreeBSD.org>
	Wed, 9 Nov 2011 01:10:17 +0000 (02:10 +0100)
		1	2
src/mainwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/monitor.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/projectlist.cpp	patch \|	diff1 \|	diff2 \|	blob \| history