about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-19 11:56:32 -0700
committerbors <bors@rust-lang.org>2014-05-19 11:56:32 -0700
commit44fcf46b00389bea30f4902ce77f2e33557d9170 (patch)
treebd287defee61c583f518a3fbca926b717bd0695d /src/libcore
parente8c579e01d026df002fe6522d6f9c123b3920dc8 (diff)
parent564b9250362cc7bb0f40320bf2cedc58ec47b077 (diff)
downloadrust-44fcf46b00389bea30f4902ce77f2e33557d9170.tar.gz
rust-44fcf46b00389bea30f4902ce77f2e33557d9170.zip
auto merge of #14292 : limeburst/rust/master, r=alexcrichton
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 05b314b6998..9f147fafdc2 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -17,7 +17,7 @@
 //!
 //! * `memcpy`, `memcmp`, `memset` - These are core memory routines which are
 //!   often generated by LLVM. Additionally, this library can make explicit
-//!   calls to these funcitons. Their signatures are the same as found in C.
+//!   calls to these functions. Their signatures are the same as found in C.
 //!   These functions are often provided by the system libc, but can also be
 //!   provided by `librlibc` which is distributed with the standard rust
 //!   distribution.