diff options
author | Henrik Nord <henrik@erlang.org> | 2019-12-10 09:43:55 +0100 |
---|---|---|
committer | Henrik Nord <henrik@erlang.org> | 2019-12-10 09:43:55 +0100 |
commit | 70ce6bbb7ae11ffd6e0c99d583826941f7a62673 (patch) | |
tree | 06bc04dd7ece1f5715ba5a82e0aee983eb98b701 /lib/tftp | |
parent | 1a1e08030800bc01aceb14e2d8c730fbbd7317bc (diff) | |
parent | 926f03ce5ba4f2156a36940d267a1a1e683484ff (diff) | |
download | erlang-70ce6bbb7ae11ffd6e0c99d583826941f7a62673.tar.gz |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
Diffstat (limited to 'lib/tftp')
-rw-r--r-- | lib/tftp/doc/src/notes.xml | 17 | ||||
-rw-r--r-- | lib/tftp/vsn.mk | 2 |
2 files changed, 17 insertions, 2 deletions
diff --git a/lib/tftp/doc/src/notes.xml b/lib/tftp/doc/src/notes.xml index ff6113a89d..0b7aee87e9 100644 --- a/lib/tftp/doc/src/notes.xml +++ b/lib/tftp/doc/src/notes.xml @@ -33,7 +33,22 @@ <file>notes.xml</file> </header> - <section><title>Tftp 1.0.1</title> + <section><title>Tftp 1.0.2</title> + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + Removed compiler warnings.</p> + <p> + Own Id: OTP-16317 Aux Id: OTP-16183 </p> + </item> + </list> + </section> + +</section> + +<section><title>Tftp 1.0.1</title> <section><title>Fixed Bugs and Malfunctions</title> <list> diff --git a/lib/tftp/vsn.mk b/lib/tftp/vsn.mk index 1a547fbe9b..689a2fa57c 100644 --- a/lib/tftp/vsn.mk +++ b/lib/tftp/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = tftp -TFTP_VSN = 1.0.1 +TFTP_VSN = 1.0.2 PRE_VSN = APP_VSN = "$(APPLICATION)-$(TFTP_VSN)$(PRE_VSN)" |