Merge branch 'master' into feature/core_convert_id

Author: Centril

.gitattributes

@@ -4,7 +4,8 @@
 *.cpp rust
 *.h rust
 *.rs rust
+*.fixed linguist-language=Rust
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
-Cargo.lock -merge
+Cargo.lock -merge linguist-generated=false

.gitignore

@@ -74,26 +74,30 @@ __pycache__/
 /obj/
 /rt/
 /rustllvm/
-/src/libstd_unicode/DerivedCoreProperties.txt
-/src/libstd_unicode/DerivedNormalizationProps.txt
-/src/libstd_unicode/PropList.txt
-/src/libstd_unicode/ReadMe.txt
-/src/libstd_unicode/Scripts.txt
-/src/libstd_unicode/SpecialCasing.txt
-/src/libstd_unicode/UnicodeData.txt
+/src/libcore/unicode/DerivedCoreProperties.txt
+/src/libcore/unicode/DerivedNormalizationProps.txt
+/src/libcore/unicode/PropList.txt
+/src/libcore/unicode/ReadMe.txt
+/src/libcore/unicode/Scripts.txt
+/src/libcore/unicode/SpecialCasing.txt
+/src/libcore/unicode/UnicodeData.txt
 /stage[0-9]+/
 /target
+target/
 /test/
 /tmp/
+tags
+tags.*
 TAGS
-TAGS.emacs
-TAGS.vi
+TAGS.*
 \#*
 \#*\#
 config.mk
 config.stamp
 keywords.md
 lexer.ml
+mir_dump
+Session.vim
 src/etc/dl
 tmp.*.rs
 version.md

.gitmodules

@@ -2,10 +2,6 @@
 	path = src/llvm
 	url = https://github.com/rust-lang/llvm.git
 	branch = master
-[submodule "src/rt/hoedown"]
-	path = src/rt/hoedown
-	url = https://github.com/rust-lang/hoedown.git
-	branch = rust-2015-09-21-do-not-delete
 [submodule "src/jemalloc"]
 	path = src/jemalloc
 	url = https://github.com/rust-lang/jemalloc.git
@@ -45,9 +41,26 @@
 [submodule "src/dlmalloc"]
 	path = src/dlmalloc
 	url = https://github.com/alexcrichton/dlmalloc-rs.git
-[submodule "src/binaryen"]
-	path = src/binaryen
-	url = https://github.com/alexcrichton/binaryen.git
 [submodule "src/doc/rust-by-example"]
 	path = src/doc/rust-by-example
 	url = https://github.com/rust-lang/rust-by-example
+[submodule "src/llvm-emscripten"]
+	path = src/llvm-emscripten
+	url = https://github.com/rust-lang/llvm
+[submodule "src/stdsimd"]
+	path = src/stdsimd
+	url = https://github.com/rust-lang-nursery/stdsimd
+[submodule "src/tools/lld"]
+	path = src/tools/lld
+	url = https://github.com/rust-lang/lld.git
+[submodule "src/libbacktrace"]
+	path = src/libbacktrace
+	url = https://github.com/rust-lang-nursery/libbacktrace
+[submodule "src/tools/lldb"]
+	path = src/tools/lldb
+	url = https://github.com/rust-lang-nursery/lldb/
+	branch = rust-release-70
+[submodule "src/tools/clang"]
+	path = src/tools/clang
+	url = https://github.com/rust-lang-nursery/clang/
+	branch = release_70

.mailmap

@@ -41,15 +41,17 @@ Boris Egorov <[email protected]> <[email protected]>
 Brandon Sanderson <[email protected]> Brandon Sanderson <[email protected]>
 Brett Cannon <[email protected]> Brett Cannon <[email protected]>
 Brian Anderson <[email protected]> <[email protected]>
+Brian Anderson <[email protected]> <[email protected]>
 Brian Dawn <[email protected]>
 Brian Leibig <[email protected]> Brian Leibig <[email protected]>
 Carl-Anton Ingmarsson <[email protected]> <[email protected]>
-Carol (Nichols || Goulding) <[email protected]>
-Carol (Nichols || Goulding) <cnichols@thinkthroughmath.com>
+Carol (Nichols || Goulding) <[email protected]> <[email protected]>
+Carol (Nichols || Goulding) <[email protected]> Carol Nichols <carol.nichols@gmail.com>
 Carol Willing <[email protected]>
 Chris C Cerami <[email protected]> Chris C Cerami <[email protected]>
 Chris Pressey <[email protected]>
 Chris Thorn <[email protected]> Chris Thorn <[email protected]>
+Chris Vittal <[email protected]> Christopher Vittal <[email protected]>
 Clark Gaebel <[email protected]> <[email protected]>
 Clinton Ryan <[email protected]>
 Corey Richardson <[email protected]> Elaine "See More" Nemo <[email protected]>
@@ -94,9 +96,9 @@ Herman J. Radtke III <[email protected]> Herman J. Radtke III <hermanradtk
 Ilyong Cho <[email protected]>
 Ivan Ivaschenko <[email protected]>
 J. J. Weber <[email protected]>
-Jakub Bukaj <[email protected]>
-Jakub Bukaj <jakub@jakub.cc> <[email protected]>
-Jakub Bukaj <jakub@jakub.cc> Jakub Bukaj <[email protected]>
+Jakub Adam Wieczorek <[email protected]> <[email protected]>
+Jakub Adam Wieczorek <jakub[email protected]> <[email protected]>
+Jakub Adam Wieczorek <jakub[email protected]> <[email protected]>
 James Deng <[email protected]> <[email protected]>
 James Miller <[email protected]> <[email protected]>
 James Perry <[email protected]>