Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 9 Jun 2010 12:20:24 +0000 (15:20 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 9 Jun 2010 12:20:24 +0000 (15:20 +0300)
commit6c0574e205d9445fb968f0ef0c0cc2421505ddf9
treee6c2714d49ce51e74bb5db5a8d9dbeb811fce380
parent2e0853d2ff8f4368e5b31ba03875e6e8e8513138
parent9d4a4837ba755d2fa9caa2df6505474a1b73f05d
Merge branch 'master' of https://vcs.maemo.org/git/situare

Conflicts:
doc/testing/functionality-tests.doc
src/common.h
src/engine/engine.cpp
src/facebookservice/facebookauthentication.cpp
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/settingsdialog.cpp
src/ui/settingsdialog.h