Merge branch 'master' into network_handler
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 24 Jun 2010 06:39:24 +0000 (09:39 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 24 Jun 2010 06:39:24 +0000 (09:39 +0300)
commit0030c3b81fecacab17b5283094db6afe6feb6766
treedf1bbd26472117ebeba23670ed8e029159812ef9
parent31c213583d6cce79156584aa8bccc58b20b919bc
parentfa914e9a1475cd815422a547bb93a428c28ae272
Merge branch 'master' into network_handler

Conflicts:
src/common.h
src/engine/engine.cpp
src/src.pro
src/ui/mainwindow.cpp
res/languages/situare_fi.qm
res/languages/situare_fi.ts
src/engine/engine.cpp
src/engine/engine.h
src/network/networkaccessmanager.cpp
src/network/networkaccessmanager.h
src/situareservice/situareservice.cpp
src/ui/mainwindow.cpp
src/ui/userinfo.cpp