This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19619 ) Change subject: Merge branch '1.0.0' into master ...................................................................... Merge branch '1.0.0' into master We tagged 1.0.0 off a non-master version in the commit history in order to keep the new TRAU frame handling out of the 1.0.0 release, but to have all of the other fixes in a tagged release. This merge brings master in sync with those changes. Change-Id: If8fc996f385f4127204ad773b991c49d853dfc5b --- M configure.ac 2 files changed, 1 insertion(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index d886232..a7dde2f 100644 --- a/configure.ac +++ b/configure.ac @@ -64,16 +64,10 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -<<<<<<< HEAD (8d1500 trau_sync: make sync pattern configurable) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.1.0) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.1.0) -======= PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0) ->>>>>>> BRANCH (2a8a34 Bump version: 0.8.0.59-1f92-dirty → 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.4.0) PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) AC_ARG_ENABLE([dahdi], -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If8fc996f385f4127204ad773b991c49d853dfc5b Gerrit-Change-Number: 19619 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge at osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200813/5c4b8d37/attachment.htm>