diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-31 09:33:52 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-31 09:34:46 +0100 |
| commit | cf37cb9f9eca32ebf9bb52b8a58b83924f081dbd (patch) | |
| tree | 4eecb7eb1b60f0488647ae9722f3ed7b266c6e09 /tools/doxygen/Doxyfile.core.internal | |
| parent | 09ac0a46f4ba899bea09c7d4da8dc7c1540f9978 (diff) | |
| parent | fa132c2f560f6cb6ce42322f446f2d61205e88f6 (diff) | |
Merge branch 'census-placeholders' into make-ruby-installable
Conflicts:
package.json
tools/doxygen/Doxyfile.core.internal
Diffstat (limited to 'tools/doxygen/Doxyfile.core.internal')
| -rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 503618fee6..e216a02c38 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1148,6 +1148,7 @@ src/core/support/tls_pthread.c \ src/core/census/context.c \ src/core/census/initialize.c \ src/core/census/operation.c \ +src/core/census/placeholders.c \ src/core/census/tag_set.c \ src/core/census/tracing.c |