diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-07 23:18:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-07 23:19:10 +0300 |
commit | 4c132dc503c7c9506e301be5b479c6c579ce9723 (patch) | |
tree | 0cdd69eed9169d4b30a8c37dd33e5f80790ce3cc /ant_landscape | |
parent | 772b5e1e245b76f0aab8b962d1e537b75ec0fbfe (diff) | |
parent | f1c55295b0d95307559c1f8b09d6b8bd6c8bbbf0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'ant_landscape')
-rw-r--r-- | ant_landscape/ErosionR.txt | 2 | ||||
-rw-r--r-- | ant_landscape/utils.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ant_landscape/ErosionR.txt b/ant_landscape/ErosionR.txt index 1dae7aa0..5b988e08 100644 --- a/ant_landscape/ErosionR.txt +++ b/ant_landscape/ErosionR.txt @@ -1,2 +1,2 @@ http://blog.michelanders.nl/search/label/erosion -https://github.com/nerk987/ErosionR
\ No newline at end of file +https://github.com/nerk987/ErosionR diff --git a/ant_landscape/utils.py b/ant_landscape/utils.py index be8f1f29..6588f75b 100644 --- a/ant_landscape/utils.py +++ b/ant_landscape/utils.py @@ -4,4 +4,3 @@ try: numexpr_available=True except ImportError: pass - |