Merge branch 'fri-1.15' into fri-1.16

lbr-stack · May 30, 2024 · f4e40ba · f4e40ba
2 parents 9e44ae9 + 99b1682
commit f4e40ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,7 +54,7 @@ set(FRICLIENT_VERSION_MINOR ${CMAKE_MATCH_2})
 set(FRICLIENT_VERSION ${FRICLIENT_VERSION_MAJOR}.${FRICLIENT_VERSION_MINOR})
 
 if (NOT FRICLIENT_VERSION STREQUAL "1.16")
-    message(FATAL_ERROR "Expected FRIClient ersion 1.16, found: " ${FRICLIENT_VERSION})
+    message(FATAL_ERROR "Expected FRIClient version 1.16, found: " ${FRICLIENT_VERSION})
 endif()
 
 message("Found FRIClient of version: " ${FRICLIENT_VERSION})

diff --git a/README.md b/README.md
@@ -8,6 +8,7 @@ This folder adds CMake support to KUKA's Fast Robot Interface (FRI).
 | `1.15`      | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-1.15)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) |
 | `1.16`      | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-1.16)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) |
 | `2.5`       | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-2.5)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml)  |
+| `3.0`       | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-3.0)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml)  |
 
 ## Build
 To build, run