Merge branches 'jmt/xmlauto', 'luff/kln89' and 'curt/radial'

author Tim Moore <timoore@redhat.com>

Mon, 12 Oct 2009 09:03:35 +0000 (11:03 +0200)

committer Tim Moore <timoore@redhat.com>

Mon, 12 Oct 2009 09:03:35 +0000 (11:03 +0200)
author Tim Moore <timoore@redhat.com>
Mon, 12 Oct 2009 09:03:35 +0000 (11:03 +0200)
committer Tim Moore <timoore@redhat.com>
Mon, 12 Oct 2009 09:03:35 +0000 (11:03 +0200)
diff --cc src/Instrumentation/navradio.cxx
Simple merge
diff --cc src/Instrumentation/navradio.hxx
Simple merge
author	Tim Moore <timoore@redhat.com>
	Mon, 12 Oct 2009 09:03:35 +0000 (11:03 +0200)
committer	Tim Moore <timoore@redhat.com>
	Mon, 12 Oct 2009 09:03:35 +0000 (11:03 +0200)
		1	2	3	4
src/Instrumentation/navradio.cxx	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
src/Instrumentation/navradio.hxx	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history