Merge branch 'new_panels' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 12 Aug 2010 09:06:16 +0000 (12:06 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 12 Aug 2010 09:06:16 +0000 (12:06 +0300)
commitb7fb88fdfb6c78fddba47bd7b1afa64a1cf354ce
tree768425fd39772c1e94f31d7ec85ac0e9f402b64b
parent5d2febf6aa8eb2302ba5ea33c208d0b26017404d
parent7ab2ab19543ab0d5391f7622eb3c42d28b27c121
Merge branch 'new_panels' into locationlistview