You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -30,9 +30,9 @@ This is a hybrid repository:
30
30
* Historically, the repo has also supported the [fips](http://floooh.github.io/fips/) C++ dependency management tool. To build with fips: `./fips build`
31
31
32
32
The primary dependency is on [g3log](https://github.com/KjellKod/g3log).
33
-
* If using ROS1 or ROS2, there are two options:
33
+
* If using either ROS1 or ROS2, there are two options:
34
34
* clone [g3log_ros](https://gitlab.com/apl-ocean-engineering/g3log_ros) into your workspace's `src/` directory
35
-
* use the provided `liboculus.rosinstall` file: `cd <catkin_ws>/src`; `vcs import --input liboculus/liboculus.repos`
35
+
* use the provided `liboculus.rosinstall` file: `cd <catkin_ws>/src`; `vcs import --input liboculus/liboculus.repos`. The `main` branch of `g3log_ros` is also a ROS1-ROS2 hybrid.
36
36
* It will be handled automagically if using fips.
37
37
38
38
The (optional) test suite also requires Googletest and the (also optional)
0 commit comments