Merged master with test script modifications
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 26 May 2010 08:52:39 +0000 (11:52 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 26 May 2010 08:52:39 +0000 (11:52 +0300)
commit7745f2095ede6559dca5ef16645e9255af48ec91
treea931658019c7d81abd7293f07958d72c449fdccb
parent28da7aea3d172744f8a073f40441ffbb28f33602
parentda3139721289287df62893771573d91f74b91d39
Merged master with test script modifications

Conflicts:
tests/ui/friendlist/friendlist.pro
src/map/friendlocationitem.h
tests/ui/friendlist/friendlist.pro