diff options
author | yang-g <yangg@google.com> | 2016-06-03 15:34:01 -0700 |
---|---|---|
committer | yang-g <yangg@google.com> | 2016-06-03 15:34:01 -0700 |
commit | aaee544d69ad53f5b173e9602fa191201c8f52e0 (patch) | |
tree | 9c5e2e2d98a4ba6000f63ee0d48f84b2e1457b3e /tools/doxygen/Doxyfile.c++.internal | |
parent | 17487f9a22bd57fa05a0b4196bbb19f62ef7eb6c (diff) | |
parent | 84f71932eaf8b601355189896fc5b91449ac82d2 (diff) |
merge and resolve conflicts
Diffstat (limited to 'tools/doxygen/Doxyfile.c++.internal')
-rw-r--r-- | tools/doxygen/Doxyfile.c++.internal | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 5107d8f6a1..1c6884c0df 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -845,7 +845,7 @@ include/grpc/impl/codegen/alloc.h \ include/grpc/impl/codegen/atm.h \ include/grpc/impl/codegen/atm_gcc_atomic.h \ include/grpc/impl/codegen/atm_gcc_sync.h \ -include/grpc/impl/codegen/atm_win32.h \ +include/grpc/impl/codegen/atm_windows.h \ include/grpc/impl/codegen/log.h \ include/grpc/impl/codegen/port_platform.h \ include/grpc/impl/codegen/slice.h \ @@ -853,7 +853,7 @@ include/grpc/impl/codegen/slice_buffer.h \ include/grpc/impl/codegen/sync.h \ include/grpc/impl/codegen/sync_generic.h \ include/grpc/impl/codegen/sync_posix.h \ -include/grpc/impl/codegen/sync_win32.h \ +include/grpc/impl/codegen/sync_windows.h \ include/grpc/impl/codegen/time.h \ src/cpp/client/secure_credentials.h \ src/cpp/common/core_codegen.h \ |