vcs.maemo.org Git - situare/commit

author	Janne Kiiski <janne.kiiski@ixonos.com>
	Fri, 12 Nov 2010 14:09:27 +0000 (16:09 +0200)
committer	Janne Kiiski <janne.kiiski@ixonos.com>
	Fri, 12 Nov 2010 14:09:27 +0000 (16:09 +0200)
commit	3a6801d7e7d9587f5ec1394c67fad009dba86dd5
tree	94d9010e122556a51b1625c6fc019f24b60431a5	tree \| snapshot
parent	d3bebbd3401d470e25f324598ab63c9e174add37	commit \| diff
parent	5800c9116605d0b9d7c698a5489f17919a26c0d4	commit \| diff

Merge branch 'qml' of https://vcs.maemo.org/git/situare into qml

Conflicts:
src/engine/engine.cpp

Unnamed repository; edit this file to name it for gitweb.