From: Stephen Seo Date: Sat, 13 Jul 2024 04:18:43 +0000 (+0900) Subject: Update README.md X-Git-Tag: 1.1~1 X-Git-Url: https://git.seodisparate.com/stephenseo/static/annotated.html?a=commitdiff_plain;h=bc6f5cb42017b8262253bebf02132ebc943be19b;p=UDPConnection Update README.md --- diff --git a/README.md b/README.md index 27c131e..7488ee3 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ Inspired by [a series of blog posts about networking for games.](https://gaffero conan packages of this library are [available here](https://git.seodisparate.com/stephenseo/-/packages/conan/udpc/versions). The `conan` branch contains the necessary changes to publish this library as a -conan package. Expect the `conan` branch to rebase on `master` in the future. +conan package. Expect the `conan` branch to merge `master` in the future. An example project is [available here](https://git.seodisparate.com/stephenseo/UDPConnection/src/branch/conan/conan_usage_example) to use this project with conan.