Skip to content

Commit 6ab3c4a

Browse files
committed
Update README.md to reflect changes in master branch
1 parent de4ceff commit 6ab3c4a

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ The branches are:
2727
* [Pull request 125](https://github.com/lewissbaker/cppcoro/pull/125) solved it for filesystem
2828
* [Pull request 158](https://github.com/lewissbaker/cppcoro/pull/158) has a nice solution.
2929
* [Pull reqeust 169](https://github.com/lewissbaker/cppcoro/pull/169) solved it with preprocessor defines
30-
* Some modifications required for gcc which should brake nothing else are in
31-
branch [fixed_for_gcc](https://github.com/andreasbuhr/cppcoro/tree/fixes_for_gcc).
3230

33-
Furthermore, there is the branch [integrate_all](https://github.com/andreasbuhr/cppcoro/tree/integrate_all)
34-
which merges all branches mentioned above. It is intended for
35-
testing of the whole thing, it is not intended for merging.
31+
In the master branch, all efforts are combined. Current build status for master branch: [![Actions Status](https://github.com/andreasbuhr/cppcoro/workflows/CMake/badge.svg)](https://github.com/andreasbuhr/cppcoro/actions).
32+
The master branch is not intended for merging.
3633
# CppCoro - A coroutine library for C++
3734

3835
The 'cppcoro' library provides a large set of general-purpose primitives for making use of the coroutines TS proposal described in [N4680](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/n4680.pdf).

0 commit comments

Comments
 (0)