Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Wed, 18 Aug 2010 07:20:41 +0000 (10:20 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Wed, 18 Aug 2010 07:20:41 +0000 (10:20 +0300)
1  2 
images.qrc

diff --cc images.qrc
Simple merge