Merge branch 'save_tokens' into new_database
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 24 Aug 2010 07:21:49 +0000 (10:21 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 24 Aug 2010 07:21:49 +0000 (10:21 +0300)
commit8f1367d663343324a15b4934b0f3ad0309afbab2
tree020078cca717f2de496d63091f36d57691911955
parent44e7cedeaf1850268442b9b195576d9a473bfbfd
parent5777a58a2e4a3e99d9bc30bb75e85e41a5f0dde8
Merge branch 'save_tokens' into new_database

Conflicts:
src/signond/credentialsdb.cpp
src/signond/credentialsdb.h

Fix conflicts and update database code
lib/plugins/SignOn/authpluginif.h
src/signond/credentialsdb.cpp
src/signond/credentialsdb.h
tests/signond-tests/databasetest.cpp
tests/signond-tests/databasetest.h