Merge branch 'master' of gitorious.org:meego-garage/garage-client-services
authorMateu Batle <mateu.batle@collabora.co.uk>
Fri, 23 Apr 2010 20:26:40 +0000 (15:26 -0500)
committerMateu Batle <mateu.batle@collabora.co.uk>
Fri, 23 Apr 2010 20:26:40 +0000 (15:26 -0500)
commit6eb928310f8f76810c117ca6b4b6d04f699847f2
tree7ff731d225f4c10a35c94ba40aa5814a0fcd1472
parent5be4f54d86c26e7ef68447994cba51e7578fd529
parente4d904d5895815c54a3b5d5f37e19bdcf80078ae
Merge branch 'master' of gitorious.org:meego-garage/garage-client-services

Conflicts:
src/src.pro
src/application.cpp
src/application.h
src/catalog.cpp
src/catalog.h
src/category.cpp
src/garageclientservices.cpp