diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-07-22 11:00:34 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-07-22 11:00:34 -0700 |
| commit | 316f73f6c15334575c98255b2feba70d1ec73193 (patch) | |
| tree | 011f29c23ae4bb1ee9bf0a09051bc9161048b460 /doc | |
| parent | c03c575c8664ebd493bbab6c71b04f22ee9a274c (diff) | |
| parent | 89a8851e6856be9b90af5db0ffdc4bc4adb1b3e1 (diff) | |
Merge v1.0.x into master
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/ |