Merge branch 'master' of https://vcs.maemo.org/git/situare into map
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 19 Apr 2010 08:26:25 +0000 (11:26 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 19 Apr 2010 08:26:25 +0000 (11:26 +0300)
1  2 
src/src.pro

diff --cc src/src.pro
Simple merge