Skip to content

Commit b495847

Browse files
authored
Merge pull request #15 from apple/master
merge
2 parents 4e65573 + 3954a4a commit b495847

File tree

6,130 files changed

+739987
-389381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,130 files changed

+739987
-389381
lines changed

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[flake8]
2-
ignore = W291
2+
ignore = W291 W504
33
filename = *.py,
44
./utils/80+-check,
55
./utils/backtrace-check,

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ docs/_build
3434
# Finder metadata
3535
.DS_Store
3636

37+
# Visual Studio metadata
38+
.vs
39+
3740
#==============================================================================#
3841
# Ignore CMake temporary files
3942
#==============================================================================#

.mailmap

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,11 @@ Daniel Duan <daniel@duan.org> <danmarner@gmail.com>
2929
Dante Broggi <34220985+Dante-Broggi@users.noreply.github.com>
3030
Dave <davesweeris@mac.com>
3131
Dave Abrahams <dabrahams@apple.com> <dave@boostpro.com>
32-
Dave Abrahams <dabrahams@apple.com> <dave@fripp.apple.com>
3332
Dave Abrahams <dabrahams@apple.com> <dave@Skree.local>
3433
Dave Abrahams <dabrahams@apple.com> <dave@Wingy.local>
3534
Dave Lee <davelee@lyft.com> <davelee.com@gmail.com>
36-
David Rönnqvist <david.ronnqvist@gmail.com> <david.ronnqvist@skype.net>
37-
David Rönnqvist <david.ronnqvist@gmail.com>
35+
David Rönnqvist <david.ronnqvist@gmail.com> <david.ronnqvist@skype.net>
36+
David Rönnqvist <david.ronnqvist@gmail.com>
3837
David Ungar <dungar@apple.com> <ungar@mac.com>
3938
David Zarzycki <dave@znu.io> <zarzycki@apple.com>
4039
David Zarzycki <dave@znu.io> <zarzycki@icloud.com>
@@ -43,10 +42,8 @@ Davide Italiano <ditaliano@apple.com> <dcci@users.noreply.github.com>
4342
Davide Italiano <ditaliano@apple.com> <dccitaliano@gmail.com>
4443
Dmitri Gribenko <gribozavr@gmail.com> <dgribenko@apple.com>
4544
Doug Coleman <doug_coleman@apple.com> <doug.coleman@gmail.com>
46-
Enrico Granata <egranata@apple.com> <egranata@egranata.apple.com>
4745
Enrico Granata <egranata@apple.com> <granata.enrico@gmail.com>
4846
Erik Eckstein <eeckstein@apple.com>
49-
Erik Eckstein <eeckstein@apple.com> <eeckstein@rad-main.corp.apple.com>
5047
Erik Verbruggen <erik.verbruggen@me.com> <erikjv@users.noreply.github.com>
5148
Ewa Matejska <ematejska@apple.com>
5249
Ewa Matejska <ematejska@apple.com> <ematejska@Ewas-MacBook-Pro.local>
@@ -130,15 +127,13 @@ Ross Bayer <ross.m.bayer@gmail.com>
130127
Russ Bishop <rbishopjr@apple.com> <russ@plangrid.com>
131128
Ryan Lovelett <ryan@lovelett.me> <RLovelett@users.noreply.github.com>
132129
Shawn Erickson <shawn.erickson@citrix.com> <shawnce@gmail.com>
133-
Slava Pestov <spestov@apple.com> <spestov@rad-main.corp.apple.com>
134130
Slava Pestov <spestov@apple.com> <sviatoslav.pestov@gmail.com>
135131
Stephen Canon <scanon@apple.com>
136132
Stephen Canon <scanon@apple.com> <stephentyrone@gmail.com>
137133
Sukolsak Sakshuwong <sukolsak@gmail.com>
138134
Todd Fiala <tfiala@apple.com> <todd.fiala@gmail.com>
139135
Toni Suter <tonisuter@me.com> <tonisuter@users.noreply.github.com>
140136
Vedant Kumar <vsk@apple.com> <vk@vedantk.com>
141-
Xi Ge <xi_ge@apple.com> <xi_ge@rad-main.corp.apple.com>
142137
Xin Tong <xin_tong@apple.com> <trent.xin.tong@gmail.com>
143138
Xin Tong <xin_tong@apple.com> <trentxintong@Xins-MacBook-Pro.local>
144139
Yuka Ezura <ezura@users.noreply.github.com> <2020337+ezura@users.noreply.github.com>

0 commit comments

Comments
 (0)