about summary refs log tree commit diff
path: root/src/libbacktrace
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-02-09 22:28:45 +0000
committerbors <bors@rust-lang.org>2016-02-09 22:28:45 +0000
commit32b2ef7add2836cba5867d2e5ac9610cef416447 (patch)
tree4e7fd04d0b3cac99c23257d42a79cf4d58b53af1 /src/libbacktrace
parent096dbf84c7acc78283adfa46eecd41d7355f6f3e (diff)
parentaf1a0a346639966373206b70d7cd6376937bb544 (diff)
downloadrust-32b2ef7add2836cba5867d2e5ac9610cef416447.tar.gz
rust-32b2ef7add2836cba5867d2e5ac9610cef416447.zip
Auto merge of #31523 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #31473, #31513, #31514, #31515, #31516, #31520
- Failed merges:
Diffstat (limited to 'src/libbacktrace')
-rw-r--r--src/libbacktrace/ansidecl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libbacktrace/ansidecl.h b/src/libbacktrace/ansidecl.h
index 6e4bfc21f25..4087dd72917 100644
--- a/src/libbacktrace/ansidecl.h
+++ b/src/libbacktrace/ansidecl.h
@@ -1,4 +1,4 @@
-/* ANSI and traditional C compatability macros
+/* ANSI and traditional C compatibility macros
    Copyright (C) 1991-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.