diff options
author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2020-04-23 10:29:45 +0000 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2020-04-23 10:29:45 +0000 |
commit | 3b478b0028d210518b5cc16ec9f208192ad31caa (patch) | |
tree | 919e5a07b37d322a56c3bbd6d5bd5f34e6057bdd | |
parent | 9ac0371bb8c0a40f5d9f82a1c25129660e81df04 (diff) | |
parent | ff4ecf9b6c6542b24b4ac6ea178be9d44e159f79 (diff) | |
download | slirp-3b478b0028d210518b5cc16ec9f208192ad31caa.zip slirp-3b478b0028d210518b5cc16ec9f208192ad31caa.tar.gz slirp-3b478b0028d210518b5cc16ec9f208192ad31caa.tar.bz2 |
Merge branch 'release-v4.3.0' into 'master'v4.3.0
Release v4.3.0
See merge request slirp/libslirp!39
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | meson.build | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d4c935b..1c118f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [4.3.0] - 2020-04-22 ### Added @@ -17,8 +17,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `slirp_version_string()` now has the git sha suffix when building form git - Limit DNS redirection to port 53 #16 -### Deprecated - ### Fixed - Fix build regression with mingw & NetBSD @@ -91,7 +89,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Standalone project, removing any QEMU dependency. - License clarifications. -[unreleased]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.2.0...master +[4.3.0]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.2.0...v4.3.0 [4.2.0]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.1.0...v4.2.0 [4.1.0]: https://gitlab.freedesktop.org/slirp/libslirp/compare/v4.0.0...v4.1.0 [4.0.0]: https://gitlab.freedesktop.org/slirp/libslirp/commits/v4.0.0 @@ -3,7 +3,7 @@ BUILD_DIR ?= . LIBSLIRP = $(BUILD_DIR)/libslirp.a SLIRP_MAJOR_VERSION = 4 -SLIRP_MINOR_VERSION = 2 +SLIRP_MINOR_VERSION = 3 SLIRP_MICRO_VERSION = 0 SLIRP_VERSION_STRING = "$(SLIRP_MAJOR_VERSION).$(SLIRP_MINOR_VERSION).$(SLIRP_MICRO_VERSION)-git" diff --git a/meson.build b/meson.build index 3a27149..2e48fd8 100644 --- a/meson.build +++ b/meson.build @@ -37,7 +37,7 @@ conf.set_quoted('SLIRP_VERSION_STRING', version) # fixed, change: # REVISION += 1 lt_current = 2 -lt_revision = 0 +lt_revision = 1 lt_age = 2 lt_version = '@0@.@1@.@2@'.format(lt_current - lt_age, lt_age, lt_revision) |