Merge branch 'master' of https://vcs.maemo.org/git/buliscores
authorDavid Solbach <d@vidsolbach.de>
Wed, 3 Nov 2010 13:22:19 +0000 (14:22 +0100)
committerDavid Solbach <d@vidsolbach.de>
Wed, 3 Nov 2010 13:22:19 +0000 (14:22 +0100)
commitc328bd4e92d8764bc4fc6404d0bb25e939804f44
tree45b3b4a2d2928a03c932ff52cb90500544804b40
parent3eee9b63ddcc4f70ac0ea8ba49e7ac0b10224394
parentf9055d976da6b85b0c1bb5d88b30d9edc9ac0ec2
Merge branch 'master' of https://vcs.maemo.org/git/buliscores

Conflicts:
src/src.pro