Fixed wrong merging
authorMateu Batle <mateu.batle@collabora.co.uk>
Wed, 28 Apr 2010 12:04:22 +0000 (07:04 -0500)
committerMateu Batle <mateu.batle@collabora.co.uk>
Wed, 28 Apr 2010 12:04:22 +0000 (07:04 -0500)
commit110434d76c68e876c6148f756a1b4715ea7fabf3
tree439d9dc431f6089f2147e94d95a266c8816f99a7
parentb83c8c09b0d5f96b443766a005fd7bb481b2c406
Fixed wrong merging
src/applicationmanager.cpp