Merge pull request #24 from AdaptiveParticles/small_patch

cheesema · web-flow · commit edb9ac873b17 · 2020-12-17T21:08:17.000+01:00
Small patch
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "LibAPR"]
 	path = LibAPR
 	url = https://github.com/AdaptiveParticles/LibAPR.git
-	branch = develop_joel
+	branch = master
 [submodule "pybind11"]
 	path = pybind11
 	url = https://github.com/pybind/pybind11.git
diff --git a/LibAPR b/LibAPR
@@ -1 +1 @@
-Subproject commit af915f3925794d296d7958c29819f268f9ba91c0
+Subproject commit 4554f33af80932ba20fbb10a99649239f120ddae
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ This requires the following packages:
 * CMake 3.6 or higher
 * LibTIFF 4.0 or higher
 
-The Python library additionally requires Python 3.
+The Python library additionally requires Python 3, and the packages listed in [requirements.txt](requirements.txt).
 
 ### Installing dependencies on Linux
 
diff --git a/pybind11 b/pybind11
@@ -1 +1 @@
-Subproject commit 028812ae7eee307dca5f8f69d467af7b92cc41c8
+Subproject commit 30eb39ed79d1e2eeff15219ac00773034300a5e6
