Merge branch 'master' into layer/magit-directors-cut

This commit is contained in:
Jonas Bernoulli 2017-08-05 14:06:54 +02:00
commit fffa2e7d23
3 changed files with 4 additions and 4 deletions

4
.gitmodules vendored
View File

@ -3,7 +3,7 @@
collective = emacsg collective = emacsg
[submodule "auto-compile"] [submodule "auto-compile"]
path = lib/auto-compile path = lib/auto-compile
url = git@github.com:tarsius/auto-compile.git url = git@github.com:emacscollective/auto-compile.git
[submodule "borg"] [submodule "borg"]
path = lib/borg path = lib/borg
url = git@github.com:emacscollective/borg.git url = git@github.com:emacscollective/borg.git
@ -48,7 +48,7 @@
url = git@github.com:magit/orgit.git url = git@github.com:magit/orgit.git
[submodule "packed"] [submodule "packed"]
path = lib/packed path = lib/packed
url = git@github.com:tarsius/packed.git url = git@github.com:emacscollective/packed.git
[submodule "use-package"] [submodule "use-package"]
path = lib/use-package path = lib/use-package
url = git@github.com:jwiegley/use-package.git url = git@github.com:jwiegley/use-package.git

@ -1 +1 @@
Subproject commit c9786234bdc32237e6c304e6a7c917504370358d Subproject commit ef7d0fb0ac902e40a5010f8c54d3fe1f279723ef

@ -1 +1 @@
Subproject commit 536f4a3bda06cc09759fed1aa0cdebb068ff75a1 Subproject commit e8b20e287222dbf08ebc46e405412c3213102a7e