Merge branch 'login_browser' into qml
authorSami Rämö <sami.ramo@ixonos.com>
Fri, 12 Nov 2010 13:24:40 +0000 (15:24 +0200)
committerSami Rämö <sami.ramo@ixonos.com>
Fri, 12 Nov 2010 13:24:40 +0000 (15:24 +0200)
commit7a4c6b0757b1137d036038e8d90e1eff4199689e
tree48cb4ec9787826ca779ee40c65491ab289c4fbc3
parentddabea27f265916296b5313600619aafeed40bc2
parentbc319a7c2e5b4b6c918f567299e0f224e0e11bc0
Merge branch 'login_browser' into qml

Conflicts:
src/src.pro
src/engine/engine.cpp
src/engine/engine.h
src/facebookservice/facebookauthentication.cpp
src/src.pro