diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-03-30 18:02:49 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-03-30 18:02:49 -0400 |
commit | 8a7253575c58134bb33b2b24f10eec7ce7bd051d (patch) | |
tree | 69cb5b499544388a821aa8f22277fd439a8dfadf | |
parent | ea78c7e06e768a02d6129c43c51473a7f94cfd73 (diff) | |
parent | 0bd63f924d81b57897185e10a0d05262038530cc (diff) | |
download | jack1-8a7253575c58134bb33b2b24f10eec7ce7bd051d.tar.gz |
Merge branch 'joshdekock-master'
-rw-r--r-- | .gitmodules | 10 | ||||
m--------- | example-clients | 0 | ||||
m--------- | jack | 0 | ||||
m--------- | tools | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index b805b45..24410fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ +[submodule "example-clients"] + path = example-clients + url = https://github.com/jackaudio/example-clients [submodule "jack"] path = jack - url = git://github.com/jackaudio/headers.git + url = https://github.com/jackaudio/headers [submodule "tools"] path = tools - url = git://github.com/jackaudio/tools.git -[submodule "example-clients"] - path = example-clients - url = git://github.com/jackaudio/example-clients.git + url = https://github.com/jackaudio/tools diff --git a/example-clients b/example-clients -Subproject e74323c535876abca9a2293bd2ca426a3b91ff8 +Subproject 7fa089095c81e81dacd2554ae3184acc7f2d58e diff --git a/jack b/jack -Subproject a2536c8b348bbfb21ec53db901e7992d7ffef47 +Subproject 07f1ecf1ce119d861ec631cb4a6a81a1ab1e565 diff --git a/tools b/tools -Subproject 8e140b72de0231d129c6006db969f1dba4f1486 +Subproject 02ddc6ea2f16e41326c675b1bcfcd6335390b88 |