aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/test_server.app.src
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2014-11-11 16:32:13 +0100
committerPeter Andersson <[email protected]>2014-11-11 16:33:49 +0100
commit2f9fdd45fa120fb535252a79c50ec64dbf1f9972 (patch)
tree3d077b43d45351551c59430d596b99f286eba06a /lib/test_server/src/test_server.app.src
parentfdc3edacb5577688dd3d92bba6194321c06537b3 (diff)
parent3133492c5902fd22817ee3f1fc65eb129c9e0574 (diff)
downloadotp-2f9fdd45fa120fb535252a79c50ec64dbf1f9972.tar.gz
otp-2f9fdd45fa120fb535252a79c50ec64dbf1f9972.tar.bz2
otp-2f9fdd45fa120fb535252a79c50ec64dbf1f9972.zip
Merge branch 'peppe/test_server/erl2html2_macro_problems' into maint
* peppe/test_server/erl2html2_macro_problems: Update test_server app file Make sure code links are generated even if undefined macros exist OTP-11766
Diffstat (limited to 'lib/test_server/src/test_server.app.src')
-rw-r--r--lib/test_server/src/test_server.app.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test_server/src/test_server.app.src b/lib/test_server/src/test_server.app.src
index 5672baa6ef..173f7075db 100644
--- a/lib/test_server/src/test_server.app.src
+++ b/lib/test_server/src/test_server.app.src
@@ -34,5 +34,5 @@
{env, []},
{runtime_dependencies, ["tools-2.6.14","stdlib-2.0","runtime_tools-1.8.14",
"observer-2.0","kernel-3.0","inets-5.10",
- "erts-6.0"]}]}.
+ "syntax_tools-1.6.16","erts-6.0"]}]}.