Merge branch 'bigger_images'
authorVille Tiensuu <ville.tiensuu@ixonos.com>
Mon, 31 May 2010 13:21:59 +0000 (16:21 +0300)
committerVille Tiensuu <ville.tiensuu@ixonos.com>
Mon, 31 May 2010 13:21:59 +0000 (16:21 +0300)
commitb53dae04989156f2e1eb9fa227dd6bf771d9a7e6
tree178d783c1b6e231dbae1993fd7d0a30d0bc0d8ce
parentff76837cc4ffe3e3e7f228f84324a7f708968039
parentef3d7de4fac984f8e0f418b620ad24f15c194efb
Merge branch 'bigger_images'
src/situareservice/situareservice.cpp
src/src.pro