summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-03-08 15:39:26 +0100
committerDavid Tardon <dtardon@redhat.com>2012-03-08 15:40:05 +0100
commit74a6d7a135ca03c23eff8b360a748a8f964c92a3 (patch)
tree13f00026e0961afa995b7abbb0eb135671f2a20d /desktop
parent4b4fb33c606fd068e024669efcbd7ad2aefdaacd (diff)
fix mis-merge
Diffstat (limited to 'desktop')
0 files changed, 0 insertions, 0 deletions