summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2017-10-05 13:33:44 -0700
committerGravatar vslashg <gfalcon@google.com>2017-10-05 16:55:26 -0400
commitd732f2014bdd141135e6af06ee5b47e7fbe4b877 (patch)
treedd5083fd1250b9300d2cfa19e862efc455c18fbe /README.md
parentcc4bed2d74f7c8717e31f9579214ab52a9c9c610 (diff)
Changes imported from Abseil "staging" branch:
- d5a5960a133967e4af02836d304884cd6cbd6e46 Adjusting time tests for flakiness by Gennadiy Civil <misterg@google.com> - ccb8535fdc92c3c99bfa2795e75d3fbdcb134571 Internal-only tweak. by Jorg Brown <jorg@google.com> - 4c03dd9e54bd4645e7e7a8dfb3c590f5b0654884 Fix comment on some C++11 type traits backport. by Xiaoyi Zhang <zhangxy@google.com> - 43cd12d2304464163e33ae932fbb842a869213dd Allow intrinsic int128 to be set for __ppc64__ targets. by Abseil Team <absl-team@google.com> - 789e9c13de67ef3c7ba09c765c3484621897b6bb Update README.md description of 'types' library to be con... by Abseil Team <absl-team@google.com> - 8be10d7683c90b85244ddc67360a7ca2dfffdf01 Update comment on move constructors' noexcept specificati... by Xiaoyi Zhang <zhangxy@google.com> GitOrigin-RevId: d5a5960a133967e4af02836d304884cd6cbd6e46 Change-Id: I743efee47b9e65f46a44d9ab80ccd62cfd0c1301
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 2d78e46d..c6db64ab 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ Abseil contains the following C++ library components:
time zones.
* [`types`](absl/types/)
<br /> The `types` library contains non-container utility types, like a
- C++11-compatible version of `absl::optional`.
+ C++11-compatible version of the C++17 `std::optional` type.
## License