Merge 6a7b122e75 into 84c6914a9b

C++.gitignore

@@ -49,14 +49,14 @@ CMakeFiles/
 CMakeCache.txt
 cmake_install.cmake
 Makefile
-install_manifest.txt
+install_manifest.txt 
 compile_commands.json
 
 # Temporary files
-*.tmp
+*.tmp 
-*.log
+*.log 
-*.bak
+*.bak 
-*.swp
+*.swp 
 
 # vcpkg
 vcpkg_installed/
@@ -66,4 +66,4 @@ vcpkg_installed/
 
 # test output & cache
 Testing/
-.cache/
+.cache/

Maven.gitignore

@@ -7,7 +7,7 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
-# https://maven.apache.org/tools/wrapper/#Usage_with_or_without_Binary_JAR
+# https://maven.apache.org/wrapper/#usage-without-binary-jar
 .mvn/wrapper/maven-wrapper.jar
 
 # Eclipse m2e generated files