Merge branch 'master' into charcounter
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Wed, 9 Jun 2010 12:52:12 +0000 (15:52 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Wed, 9 Jun 2010 13:17:17 +0000 (16:17 +0300)
commitf52ef04155519314ae27182c6c72dd290dc89a4f
tree8cc48d6d916b21ac4e57590b4040c9345634ed5a
parent4a90562dcb2200000e22107e24067d621fbbf20c
parent3b8be41ceaf7c7d02480a4ea248f6ac827881ff7
Merge branch 'master' into charcounter
Reviewed by Marko Niemelä
src/ui/mainwindow.cpp