summaryrefslogtreecommitdiffstats
path: root/cervisia/mergedlg.h
diff options
context:
space:
mode:
Diffstat (limited to 'cervisia/mergedlg.h')
-rw-r--r--cervisia/mergedlg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cervisia/mergedlg.h b/cervisia/mergedlg.h
index 58327b74..25289224 100644
--- a/cervisia/mergedlg.h
+++ b/cervisia/mergedlg.h
@@ -38,7 +38,7 @@ class MergeDialog : public KDialogBase
public:
MergeDialog( CvsService_stub* service,
- TQWidget *tqparent=0, const char *name=0 );
+ TQWidget *parent=0, const char *name=0 );
bool byBranch() const;
TQString branch() const;