Skip to content

Commit 13d0639

Browse files
authored
Merge branch 'mlee03:main' into make_mosaic
2 parents 560ccc7 + 2408f8c commit 13d0639

29 files changed

Lines changed: 1292 additions & 326 deletions

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ MANIFEST
2424
*__pycache__
2525
CMakeCache.txt
2626
*.so
27-
FRENCTools_lib/cfrenctools/CMakeFiles/
28-
FRENCTools_lib/cfrenctools/c_build/
27+
FREnctools_lib/cfrenctools/CMakeFiles/
28+
FREnctools_lib/cfrenctools/c_build/
2929
Makefile
3030
compile_log.txt

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
[submodule "pyFMS"]
33
path = pyFMS
4-
url = https://github.com/fmalatino/pyFMS.git
4+
url = https://github.com/NOAA-GFDL/pyFMS.git

0 commit comments

Comments
 (0)