aboutsummaryrefslogtreecommitdiff
path: root/devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp')
-rw-r--r--devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp b/devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp
deleted file mode 100644
index 23f679ad04aa..000000000000
--- a/devel/subcommander2/files/patch-subcommander__settings__ToolsSettingsWidget.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- subcommander/settings/ToolsSettingsWidget.cpp.orig 2007-08-19 22:04:03.000000000 +0900
-+++ subcommander/settings/ToolsSettingsWidget.cpp 2012-05-10 05:29:12.000000000 +0900
-@@ -39,7 +39,7 @@
- vl->addStretch(1);
- {
- // diff command
-- QLabel* diffLabel = new QLabel(_q("(visual) diff comand:"), this);
-+ QLabel* diffLabel = new QLabel(_q("(visual) diff command:"), this);
- QPushButton* diffBi = new QPushButton( _q("reset/builtin"), this );
- _diffEdit = new QLineEdit( this );
- QPushButton* diffEx = new ExternButton( this );
-@@ -59,7 +59,7 @@
- row++;
-
- // merge command
-- QLabel* mergeLabel = new QLabel(_q("(visual) merge comand:"), this);
-+ QLabel* mergeLabel = new QLabel(_q("(visual) merge command:"), this);
- QPushButton* mergeBi = new QPushButton( _q("reset/builtin"), this );
- _mergeEdit = new QLineEdit( this );
- QPushButton* mergeEx = new ExternButton( this );