Merge aa31bb0fc9 into 84c6914a9b

Merge branch 'main' into patch-3
Add .CondaPkg
2026-11-07 18:40:50 +01:00 · 2026-04-04 07:52:19 +00:00 · 2025-12-07 11:21:44 +08:00 · 2024-08-14 16:19:40 +08:00
6 changed files with 8 additions and 16 deletions
@@ -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/
@@ -1,6 +1,5 @@
 # General
 .DS_Store
 .localized
 __MACOSX/
 .AppleDouble
 .LSOverride
@@ -21,6 +21,7 @@ docs/site/
 # It records a fixed state of all packages used by the project. As such, it should not be
 # committed for packages, but should be committed for applications that require a static
 # environment.
 .CondaPkg/
 Manifest*.toml
 # File generated by the Preferences package to store local preferences
@@ -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
@@ -4,6 +4,3 @@ result-*
 # Ignore automatically generated direnv output
 .direnv
 # Ignore NixOS interactive test driver history
 **/.nixos-test-history
@@ -75,11 +75,6 @@ acs-*.bib
 # comment
 *.cut
 # context
 *.tuc
 *.tui
 *.tuo
 # cprotect
 *.cpt
Author	SHA1	Message	Date
xgdgsc	95b9cb676b	Merge `aa31bb0fc9` into `84c6914a9b`	2026-04-04 07:52:19 +00:00
xgdgsc	aa31bb0fc9	Merge branch 'main' into patch-3	2025-12-07 11:21:44 +08:00
xgdgsc	a16c240cf7	Add .CondaPkg	2024-08-14 16:19:40 +08:00