Merge branch 'new_panels' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 16 Aug 2010 08:56:00 +0000 (11:56 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 16 Aug 2010 08:56:00 +0000 (11:56 +0300)
commit29bc57d6aee49487110c32268e7af1372f134883
treef7f493ee939ddba4d4db48c001e1b0223d3214a6
parent5837c9970ced247fea949c73da766abb44b0b04a
parent4af7670f591161a8f0dc3e27b33e080e16167666
Merge branch 'new_panels' into locationlistview
src/ui/mainwindow.cpp