resolved conflicts

lbl-srg · Sep 12, 2023 · 3ffb94b · 3ffb94b
1 parent 0706152
commit 3ffb94b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,16 @@
 # Change Log
 
+## Version 1.0.0
+
+- Add macOS universal build
+- Add support for headless Linux
+- Other bug fixes and improvements
+
 ## Version 0.3.1
 
 - Add tube size limit to avoid vanishing tube size in case of relative tolerance and low variable value
 - Change print format for higher precision (`%.16g`)
-- Drop the Python 2
-- Update the setuptool version to latest
-- Optimize source codes to avod warnings
+
 ## Version 0.3.0
 
 - Add local tolerance parameters `ltolx` and `ltoly`

diff --git a/pyfunnel/lib/darwin64/libfunnel.dylib b/pyfunnel/lib/darwin64/libfunnel.dylib
diff --git a/pyfunnel/lib/linux64/libfunnel.so b/pyfunnel/lib/linux64/libfunnel.so
diff --git a/pyfunnel/lib/win64/funnel.dll b/pyfunnel/lib/win64/funnel.dll
diff --git a/pyfunnel/lib/win64/funnel.lib b/pyfunnel/lib/win64/funnel.lib