Merge branch 'rr1-maint'
commit0f56afbffde95ff8153c3f32f43d1c3374a4fe07
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Mon, 27 Feb 2012 05:41:33 +0000 (27 07:41 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Mon, 27 Feb 2012 05:41:33 +0000 (27 07:41 +0200)
treed0c070ca42b5a468a4f41621415eafe1beef8a52
parent42c56ba7013ded7463ed4bb1f9486f87a96acbc3
parentccde3f21be9adf0429648ed81955c4297e7a3d15
Merge branch 'rr1-maint'
include/core/controllerframe.hpp