Google Git
Sign in
fuchsia/third_party/github.com/Kitware/CMake/a9f992434d3a75f262d261d6a8a5a111a757d5bd
commit
a9f992434d3a75f262d261d6a8a5a111a757d5bd
[log]
author
Duncan Ogilvie <mr.exodia.tpodt@gmail.com>
Tue Jun 08 21:58:42 2021 +0200
committer
Duncan Ogilvie <mr.exodia.tpodt@gmail.com>
Tue Jun 08 23:23:38 2021 +0200
tree
847bd8c0c2038ac07eb7a7cf9818e014ee3ea47b
parent
c63ad0c2d1ee657a65585d0d0ea61279ca0db4d7 [diff]
VS: Remove the /MERGE flag from FlagTables

Fixes #22229
6 files changed
tree: 847bd8c0c2038ac07eb7a7cf9818e014ee3ea47b
  1. .github/
  2. .gitlab/
  3. Auxiliary/
  4. Help/
  5. Licenses/
  6. Modules/
  7. Packaging/
  8. Source/
  9. Templates/
  10. Tests/
  11. Utilities/
  12. .clang-format
  13. .clang-tidy
  14. .codespellrc
  15. .editorconfig
  16. .gitattributes
  17. .gitignore
  18. .gitlab-ci.yml
  19. .hooks-config
  20. bootstrap
  21. cmake_uninstall.cmake.in
  22. CMakeCPack.cmake
  23. CMakeCPackOptions.cmake.in
  24. CMakeGraphVizOptions.cmake
  25. CMakeLists.txt
  26. CMakeLogo.gif
  27. CompileFlags.cmake
  28. configure
  29. CONTRIBUTING.rst
  30. Copyright.txt
  31. CTestConfig.cmake
  32. CTestCustom.cmake.in
  33. DartConfig.cmake
  34. doxygen.config
  35. README.rst