Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 18 Jun 2010 11:39:11 +0000 (14:39 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 18 Jun 2010 11:39:11 +0000 (14:39 +0300)
1  2 
src/src.pro

diff --cc src/src.pro
Simple merge