Merge branch 'list_panel'
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 14 May 2010 09:07:46 +0000 (12:07 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 14 May 2010 09:07:46 +0000 (12:07 +0300)
commit9dad208a59a9f97fa225569dab1d44da3cca82ed
tree88b8be72aba651d75d23d61565539897695823e5
parent1e5b1e03ea3fddf1b5dc0c30201851bc7984555b
parent27d0dd2e9bc91a98359b3ff18a63780ee346753d
Merge branch 'list_panel'

Conflicts:
src/engine/engine.cpp
src/ui/mainwindow.cpp
src/ui/mainwindow.h
14 files changed:
src/engine/engine.cpp
src/engine/engine.h
src/facebookservice/facebookauthentication.cpp
src/gps/gpsposition.cpp
src/gps/gpspositioninterface.h
src/gps/gpspositionmockup.h
src/map/mapengine.cpp
src/map/mapengine.h
src/src.pro
src/ui/avatarimage.h
src/ui/friendlistitem.h
src/ui/friendlistpanel.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h