summaryrefslogtreecommitdiff
path: root/desktop/inc
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-03-13 16:07:53 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-03-13 16:07:53 -0500
commit8f63d98ef94647792a230360e05a85bce194219a (patch)
tree7b8b3d7f473a01b7e32e9be6cc7d385e530801df /desktop/inc
parent3d386e3e3ef221cc7f88c61ac3ce4cdac9cf0d00 (diff)
fix mis-merge in desktop
Diffstat (limited to 'desktop/inc')
-rwxr-xr-xdesktop/inc/app.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 3a4f5253c537..9872bbeefd58 100755
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -63,7 +63,7 @@ class Desktop : public Application
{
friend class UserInstall;
- void doShutdown();
+ int doShutdown();
public:
enum BootstrapError