Merge branch 'develop'

This commit is contained in:
Oliver Kowalke 2015-06-29 17:28:07 +02:00
commit 05f64409da

View File

@ -4,7 +4,7 @@
"authors": [ "authors": [
"Oliver Kowalke" "Oliver Kowalke"
], ],
"description": "(C++11) Coroutine library.", "description": "(C++14) Coroutine library.",
"category": [ "category": [
"Concurrent" "Concurrent"
], ],