aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-02-18 12:13:52 +0100
committerHenrik Nord <[email protected]>2016-02-18 12:13:52 +0100
commita4c70ebcd1a45e48f48ff65986b421b30dd89487 (patch)
tree41c4042d2ced80147d9e6ca43048025f1e2b5134 /erts
parent2b01586730f2e59064ecd9cc1bf8a9a207d41764 (diff)
parent960d11b4aa9fa55afbfb07c3fbd0b4fdee7e1269 (diff)
downloadotp-a4c70ebcd1a45e48f48ff65986b421b30dd89487.tar.gz
otp-a4c70ebcd1a45e48f48ff65986b421b30dd89487.tar.bz2
otp-a4c70ebcd1a45e48f48ff65986b421b30dd89487.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rwxr-xr-xerts/etc/win32/cygwin_tools/vc/cc.sh2
-rw-r--r--erts/etc/win32/msys_tools/vc/cc.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/etc/win32/cygwin_tools/vc/cc.sh b/erts/etc/win32/cygwin_tools/vc/cc.sh
index 48a579d5f0..651b6e098d 100755
--- a/erts/etc/win32/cygwin_tools/vc/cc.sh
+++ b/erts/etc/win32/cygwin_tools/vc/cc.sh
@@ -267,7 +267,7 @@ for x in $SOURCES; do
echo
echo
after_sed=`date '+%s'`
- echo Made dependencises for $x':' `expr $after_sed '-' $start_time` 's' >&2
+ echo Made dependencies for $x':' `expr $after_sed '-' $start_time` 's' >&2
fi
else
cat $MSG_FILE
diff --git a/erts/etc/win32/msys_tools/vc/cc.sh b/erts/etc/win32/msys_tools/vc/cc.sh
index ac89aac34e..72005862ed 100644
--- a/erts/etc/win32/msys_tools/vc/cc.sh
+++ b/erts/etc/win32/msys_tools/vc/cc.sh
@@ -268,7 +268,7 @@ for x in $SOURCES; do
echo
echo
after_sed=`date '+%s'`
- echo Made dependencises for $x':' `expr $after_sed '-' $start_time` 's' >&2
+ echo Made dependencies for $x':' `expr $after_sed '-' $start_time` 's' >&2
fi
else
cat $MSG_FILE