aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-02-15 17:04:01 +0100
committerLukas Larsson <[email protected]>2013-02-15 17:04:01 +0100
commit2f4ed0cac2707921b6f5b9cc2ad8192502733913 (patch)
tree74db79e894a5876b2983f92238c74579922e9a83 /erts
parent90d5ffbc08de4ff974440e468e1eb20a01d308e1 (diff)
parent2818b1ff65d326e7ac7ff2280495b286efe30303 (diff)
downloadotp-2f4ed0cac2707921b6f5b9cc2ad8192502733913.tar.gz
otp-2f4ed0cac2707921b6f5b9cc2ad8192502733913.tar.bz2
otp-2f4ed0cac2707921b6f5b9cc2ad8192502733913.zip
Merge branch 'lukas/erts/add_sha_to_shell_title/OTP-10838'
* lukas/erts/add_sha_to_shell_title/OTP-10838: Remove could not find warning
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 7033ea0a3d..2877e58cdf 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -20,7 +20,7 @@
include $(ERL_TOP)/make/target.mk
include ../vsn.mk
include $(ERL_TOP)/make/$(TARGET)/otp.mk
-include $(TARGET)/gen_git_version.mk
+-include $(TARGET)/gen_git_version.mk
ENABLE_ALLOC_TYPE_VARS = @ENABLE_ALLOC_TYPE_VARS@