Merge branch 'master' into new_info_panel_inheritance
authorKaj Wallin <kaj.wallin@ixonos.com>
Fri, 21 May 2010 11:32:35 +0000 (14:32 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Fri, 21 May 2010 11:32:35 +0000 (14:32 +0300)
commitb46eaca2f4eaa8e6eb75f144f49b561374adcb12
tree7f38c3dc845dcc601ad2b0725ed3573672c61181
parent1de82358d1169ce0f2e40309d1715b069e13defb
parentbe9403a9a43d8a3e97d7706221bdf5afe8f97169
Merge branch 'master' into new_info_panel_inheritance
src/src.pro