Merge branch 'image_fetcher' of https://vcs.maemo.org/git/situare into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 30 Apr 2010 08:11:18 +0000 (11:11 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 30 Apr 2010 08:11:18 +0000 (11:11 +0300)
commit9dad6cc9d07af893fd350580398464815778a576
tree61772aab26b4dcabc52f758dd5525ba58815fbff
parent5ae403ad4e1df26ee4e37e8b9932d9e75651d2d5
parent43d23e74a64e4608338f9da240a81c3f05ec6c16
Merge branch 'image_fetcher' of https://vcs.maemo.org/git/situare into friendlist
src/engine/engine.cpp
src/engine/engine.h