Merge pull request #37 from markplagge/Develop

update network-schema-io with latest development branch,
markplagge · Apr 14, 2017 · ec2c0b9 · ec2c0b9
2 parents 3cedd59 + 587da75
commit ec2c0b9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,12 +39,15 @@ compile_commands.json
 
 .idea/NeMo.iml
 
-cmake-build-debug/*
-cmake-build-release/*
-.idea/.name
 
-__pycache__/api_def.cpython-35.pyc
+\.idea/
 
-__pycache__/api_def.cpython-36.pyc
+__pycache__/
 
-~$api_ref.xlsx
+cmake-build-debug/bin/
+
+cmake-build-debug/
+
+cmake-build-release/src/
+
+cmake-build-release/
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,9 @@
 [submodule "ROSS"]
 	path = ROSS
-	url = git@github.com:carothersc/ROSS.git
+
+	url = https://github.com/carothersc/ROSS.git
+
 [submodule "src/lib/c11t"]
 	path = src/lib/c11t
 	url = https://github.com/jtsiomb/c11threads.git
+