-
Committer:
Florian Boucault
-
Date:
2011-01-17 04:11:10 UTC
-
mfrom:
(367 bamf-qt)
-
mto:
This revision was merged to the branch mainline in
revision
368.
-
Revision ID:
florian@boucault.net-20110117041110-owkv1yhps5sdhltx
Merged from trunk. Resolved conflict due to migration from qmake to cmake.