diff options
| author | Micael Karlberg <[email protected]> | 2011-11-09 18:16:27 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-11-09 18:16:27 +0100 |
| commit | 167a7f838d15b02e837d220fbf5130d926cb74e8 (patch) | |
| tree | 37b6dab531fddcb2ed98ff1f70c43b06a6059bc1 /erts/Makefile.in | |
| parent | f561a98a9b89738467b52ab5213562de753f6ad2 (diff) | |
| parent | 5fdd7be5b5b99658f7f9d05e7df3a572d73dd6cb (diff) | |
| download | otp-167a7f838d15b02e837d220fbf5130d926cb74e8.tar.gz otp-167a7f838d15b02e837d220fbf5130d926cb74e8.tar.bz2 otp-167a7f838d15b02e837d220fbf5130d926cb74e8.zip | |
Initial merge from r13 topic branch. With minimal cleanup.
Merge branch 'bmk/inets/httpd/xss_with_bad_header_date/r13/OTP-9674' into bmk/inets/httpd/xss_with_bad_header_date/r14/OTP-9674
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/http_server/mod_responsecontrol.erl
lib/inets/src/inets_app/inets.appup.src
lib/inets/test/httpd_1_1.erl
lib/inets/test/httpd_SUITE.erl
lib/inets/test/httpd_mod.erl
lib/inets/test/httpd_test_lib.erl
lib/inets/vsn.mk
Diffstat (limited to 'erts/Makefile.in')
0 files changed, 0 insertions, 0 deletions