Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 14 May 2010 12:43:02 +0000 (15:43 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 14 May 2010 12:43:02 +0000 (15:43 +0300)
commit233c99534a0a2a82560abf4f231a03ae10a8c3fa
tree781324cf5c1a617c30af3f762dfec5d84a7ed2dc
parenta014d114985404f81670850bce1460e81da87bf7
parent6ab8f09e185056f1a612f87f20989466edc1bd78
Merge branch 'master' of https://vcs.maemo.org/git/situare
src/engine/engine.cpp
src/ui/friendlistitem.cpp