Merge remote-tracking branch 'refs/remotes/origin/main'

2024-07-13 15:37:26 -04:00 · 2024-07-13 15:37:26 -04:00 · f7f63f6f84
parent b232aaccf8 ce1ffdee89
commit f7f63f6f84
3 changed files with 1378 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,4 +7,7 @@ out/
 massif.*
 callgrind.*
 *.out.*
+<<<<<<< HEAD
 heaptrack.*
+=======
+>>>>>>> refs/remotes/origin/main
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.25)
-project(blt-gp VERSION 0.0.74)
+project(blt-gp VERSION 0.0.75)

 include(CTest)

--- a/dhat.out.293761
+++ b/dhat.out.293761