diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-11-13 14:17:26 +0100 | 
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-11-13 14:17:26 +0100 | 
| commit | 7cf7cad70ec2b10a46b1f1c01a1d609467918492 (patch) | |
| tree | 49943be69110215a353b8a0c2f68b47098d93ee1 /lib/test_server/src/test_server.app.src | |
| parent | 509163307c31bf4f98a638b47ee03a5b99eb2c73 (diff) | |
| parent | e61f384adff0c9b134750ee239581296d25c10cd (diff) | |
| download | otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.tar.gz otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.tar.bz2 otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.zip | |
Merge branch 'maint' of git-server:otp into maint
Diffstat (limited to 'lib/test_server/src/test_server.app.src')
| -rw-r--r-- | lib/test_server/src/test_server.app.src | 2 | 
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"]}]}. | 
