Merge branch 'release-cand-3.3' of ssh://github.com/GrossfieldLab/loo…

…s into release-cand-3.3
GrossfieldLab · Jan 21, 2021 · 5ead63d · 5ead63d
2 parents 1ad9079 + 3ecc094
commit 5ead63d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2021-01-18  Alan Grossfield <alan>
+	* Merged in ocf tool
+
 2021-01-05  Alan Grossfield <alan>
 	*  Merged dipole computation into membrane_map