# HG changeset patch
# User Stefan Karlsson <stefan.karlsson@nokia.com>
# Date 1269861944 -3600
# Node ID 1e83ea7cca76e067c26697d1319faee9853400a3
# Parent  ecca05ffb94733cfac0a4aecd6762c0168a933ba# Parent  5b988b912a906825720b4bb01a02fadc7a083c7e
Merge.

diff -r ecca05ffb947 -r 1e83ea7cca76 camerauis/cameraapp/generic/inc/CamAppUi.h
--- a/camerauis/cameraapp/generic/inc/CamAppUi.h	Sat Mar 27 17:26:59 2010 +0000
+++ b/camerauis/cameraapp/generic/inc/CamAppUi.h	Mon Mar 29 12:25:44 2010 +0100
@@ -393,7 +393,7 @@
         * 
         * @return ETrue if wait dialog exist
         */
-        TBool CCamAppUi::IsWaitDialog() const;
+        TBool IsWaitDialog() const;
 
         /**
         * Returns the active camera