Merge commit 'origin/login_browser' into qml
authorJanne Kiiski <janne.kiiski@ixonos.com>
Thu, 11 Nov 2010 10:02:13 +0000 (12:02 +0200)
committerJanne Kiiski <janne.kiiski@ixonos.com>
Thu, 11 Nov 2010 10:02:13 +0000 (12:02 +0200)
commitf70dfa0702d7cb5895a2f1f8128620f34fc6142f
tree3f9937fb78b98c17825a4459968d36cbdfe085c2
parentd8dc15f097118cbe0d69e4e9abc979a292583b0a
parent49b5e403e51174df27d0e737148868689456f78a
Merge commit 'origin/login_browser' into qml
src/engine/engine.cpp
src/src.pro