summaryrefslogtreecommitdiff
path: root/cesar/common
diff options
context:
space:
mode:
authorNicolas Schodet2012-09-20 16:57:48 +0200
committerNicolas Schodet2012-10-04 15:50:14 +0200
commitd6a2d5d029af1a0edfa51570dfdebbea97136328 (patch)
tree6f13201a128efd9a5f53e2f5574bd3b177f73eeb /cesar/common
parent45bf1680f173591dd8d9662d1e549cf8caca55d1 (diff)
cesar/common/tools/config-merge: fix typo
Diffstat (limited to 'cesar/common')
-rwxr-xr-xcesar/common/tools/config-merge2
1 files changed, 1 insertions, 1 deletions
diff --git a/cesar/common/tools/config-merge b/cesar/common/tools/config-merge
index 6eff2cfa60..fff4702fd6 100755
--- a/cesar/common/tools/config-merge
+++ b/cesar/common/tools/config-merge
@@ -37,7 +37,7 @@ sub type
# All configuration items with default values or values from project config.
my %conf;
-# Set to overriden level (0: globally set, 1: build type set).
+# Set to overridden level (0: globally set, 1: build type set).
my %conf_set;
# Get build type.