diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-07-21 21:28:33 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-07-21 21:28:33 +0200 |
| commit | 8bb4ecdcbf4e41b08ebc3847b926fe520657a2b7 (patch) | |
| tree | be97bdecfdca49e56e4b7bd00ddfee792a17a2ae /doc | |
| parent | 8f18ee64b26d9a1462e8bccfb15aba00e8550492 (diff) | |
| parent | f6aefa3ea66d6e49c3853dea260ef723ff796f99 (diff) | |
Merge remote-tracking branch 'google/v1.0.x' into no_verbose_fix
Conflicts:
tools/run_tests/run_tests.py
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000000..95464d3e66 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,2 @@ +build/ +src/ |