Skip to content

Commit

Permalink
Merge pull request #15 from apple/master
Browse files Browse the repository at this point in the history
merge
  • Loading branch information
JacobMao authored Jul 10, 2019
2 parents 4e65573 + 3954a4a commit b495847
Show file tree
Hide file tree
Showing 6,130 changed files with 739,987 additions and 389,381 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[flake8]
ignore = W291
ignore = W291 W504
filename = *.py,
./utils/80+-check,
./utils/backtrace-check,
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ docs/_build
# Finder metadata
.DS_Store

# Visual Studio metadata
.vs

#==============================================================================#
# Ignore CMake temporary files
#==============================================================================#
Expand Down
9 changes: 2 additions & 7 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,11 @@ Daniel Duan <daniel@duan.org> <danmarner@gmail.com>
Dante Broggi <34220985+Dante-Broggi@users.noreply.github.com>
Dave <davesweeris@mac.com>
Dave Abrahams <dabrahams@apple.com> <dave@boostpro.com>
Dave Abrahams <dabrahams@apple.com> <dave@fripp.apple.com>
Dave Abrahams <dabrahams@apple.com> <dave@Skree.local>
Dave Abrahams <dabrahams@apple.com> <dave@Wingy.local>
Dave Lee <davelee@lyft.com> <davelee.com@gmail.com>
David Rönnqvist <david.ronnqvist@gmail.com> <david.ronnqvist@skype.net>
David Rönnqvist <david.ronnqvist@gmail.com>
David Rönnqvist <david.ronnqvist@gmail.com> <david.ronnqvist@skype.net>
David Rönnqvist <david.ronnqvist@gmail.com>
David Ungar <dungar@apple.com> <ungar@mac.com>
David Zarzycki <dave@znu.io> <zarzycki@apple.com>
David Zarzycki <dave@znu.io> <zarzycki@icloud.com>
Expand All @@ -43,10 +42,8 @@ Davide Italiano <ditaliano@apple.com> <dcci@users.noreply.github.com>
Davide Italiano <ditaliano@apple.com> <dccitaliano@gmail.com>
Dmitri Gribenko <gribozavr@gmail.com> <dgribenko@apple.com>
Doug Coleman <doug_coleman@apple.com> <doug.coleman@gmail.com>
Enrico Granata <egranata@apple.com> <egranata@egranata.apple.com>
Enrico Granata <egranata@apple.com> <granata.enrico@gmail.com>
Erik Eckstein <eeckstein@apple.com>
Erik Eckstein <eeckstein@apple.com> <eeckstein@rad-main.corp.apple.com>
Erik Verbruggen <erik.verbruggen@me.com> <erikjv@users.noreply.github.com>
Ewa Matejska <ematejska@apple.com>
Ewa Matejska <ematejska@apple.com> <ematejska@Ewas-MacBook-Pro.local>
Expand Down Expand Up @@ -130,15 +127,13 @@ Ross Bayer <ross.m.bayer@gmail.com>
Russ Bishop <rbishopjr@apple.com> <russ@plangrid.com>
Ryan Lovelett <ryan@lovelett.me> <RLovelett@users.noreply.github.com>
Shawn Erickson <shawn.erickson@citrix.com> <shawnce@gmail.com>
Slava Pestov <spestov@apple.com> <spestov@rad-main.corp.apple.com>
Slava Pestov <spestov@apple.com> <sviatoslav.pestov@gmail.com>
Stephen Canon <scanon@apple.com>
Stephen Canon <scanon@apple.com> <stephentyrone@gmail.com>
Sukolsak Sakshuwong <sukolsak@gmail.com>
Todd Fiala <tfiala@apple.com> <todd.fiala@gmail.com>
Toni Suter <tonisuter@me.com> <tonisuter@users.noreply.github.com>
Vedant Kumar <vsk@apple.com> <vk@vedantk.com>
Xi Ge <xi_ge@apple.com> <xi_ge@rad-main.corp.apple.com>
Xin Tong <xin_tong@apple.com> <trent.xin.tong@gmail.com>
Xin Tong <xin_tong@apple.com> <trentxintong@Xins-MacBook-Pro.local>
Yuka Ezura <ezura@users.noreply.github.com> <2020337+ezura@users.noreply.github.com>
Expand Down
Loading

0 comments on commit b495847

Please sign in to comment.