Merge branch 'master' into charcounter
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Wed, 9 Jun 2010 09:46:04 +0000 (12:46 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Wed, 9 Jun 2010 09:46:04 +0000 (12:46 +0300)
commit9c3ec6c37c799c8390ce50d8a56de288de08c368
tree8ab7c80a3ef18cffdc61afc8a69a9bae02690d10
parentbcb1c1bd2d18300f6c7a48b42b9c65f52c71eb6e
parent9d4a4837ba755d2fa9caa2df6505474a1b73f05d
Merge branch 'master' into charcounter

Conflicts:
src/ui/updatelocation/updatelocationdialog.cpp
src/ui/updatelocation/updatelocationdialog.h
src/ui/userinfo.cpp
src/ui/mainwindow.cpp