openal-soft ndll files

FunkinCrew · Feb 20, 2024 · 90e6727 · 90e6727
1 parent 6c92c7e
commit 90e6727
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 10 deletions.
diff --git a/ndll/Windows/lime-debug.ndll b/ndll/Windows/lime-debug.ndll
diff --git a/ndll/Windows/lime.ndll b/ndll/Windows/lime.ndll
diff --git a/ndll/Windows/lime.ndll.hash b/ndll/Windows/lime.ndll.hash
@@ -1,5 +1 @@
-<<<<<<< HEAD
-49e39c93287e82ba877f599e9152fffd
-=======
-8b6727c0ea9f63970c34a22225811451
->>>>>>> origin/develop2
+49e39c93287e82ba877f599e9152fffd
diff --git a/ndll/Windows64/lime-debug.ndll b/ndll/Windows64/lime-debug.ndll
diff --git a/ndll/Windows64/lime.ndll b/ndll/Windows64/lime.ndll
diff --git a/ndll/Windows64/lime.ndll.hash b/ndll/Windows64/lime.ndll.hash
@@ -1,5 +1 @@
-<<<<<<< HEAD
-58bd5f872dee9797dc9c112cc1d3289a
-=======
-57d22dc0628463cad9056145c99249ec
->>>>>>> origin/develop2
+58bd5f872dee9797dc9c112cc1d3289a