Merge branch 'appstatuscache'
authorMateu Batle <mateu.batle@collabora.co.uk>
Tue, 20 Apr 2010 11:33:53 +0000 (06:33 -0500)
committerMateu Batle <mateu.batle@collabora.co.uk>
Tue, 20 Apr 2010 11:33:53 +0000 (06:33 -0500)
commit0265808bedf06e7c5a986e06cc02e80ad7b14bbf
treeaef2997483b988685e3d5a25310f51e99a269991
parent91b6feb9f00e45bab138c5c9660242215072025a
parent1a46e965303bef538d63d37f60143c8fc94a29b2
Merge branch 'appstatuscache'
src/application.cpp
src/application.h