From: David Solbach Date: Wed, 3 Nov 2010 13:22:19 +0000 (+0100) Subject: Merge branch 'master' of https://vcs.maemo.org/git/buliscores X-Git-Url: http://git.maemo.org/git/?p=buliscores;a=commitdiff_plain;h=c328bd4e92d8764bc4fc6404d0bb25e939804f44 Merge branch 'master' of https://vcs.maemo.org/git/buliscores Conflicts: src/src.pro --- c328bd4e92d8764bc4fc6404d0bb25e939804f44