Merge branch 'image_fetcher'
authorlampehe-local <henri.lampela@ixonos.com>
Thu, 29 Apr 2010 09:52:14 +0000 (12:52 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Thu, 29 Apr 2010 09:52:14 +0000 (12:52 +0300)
commit3acec80576c9dd868d9dee698aff6b34371d3790
treeb82a991501c7f4e8e79fae687a797240e10e2741
parent34dc251aaf0d1a24dc2cf4d11e650c2d269646cc
parent27626502ec4819ed82a71b78dbbd0d1446ff3c53
Merge branch 'image_fetcher'

Conflicts:
src/ui/updatelocation/updatelocationdialog.cpp
src/ui/updatelocation/updatelocationdialog.h
src/src.pro
src/ui/listviewscreen.cpp
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/updatelocation/updatelocationdialog.cpp
src/ui/updatelocation/updatelocationdialog.h