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

This commit is contained in:
Jonas Bernoulli 2018-06-23 22:47:29 -05:00
commit dece7f36ea
10 changed files with 9 additions and 13 deletions

1
.gitmodules vendored
View File

@ -39,6 +39,7 @@
[submodule "magit"]
path = lib/magit
url = git@github.com:magit/magit.git
recursive-byte-compile = true
info-path = Documentation
[submodule "magit-imerge"]
path = lib/magit-imerge

View File

@ -30,11 +30,6 @@
(require 'use-package)
(setq use-package-verbose t))
(use-package subr-x
:config
(put 'if-let 'byte-obsolete-info nil)
(put 'when-let 'byte-obsolete-info nil))
(use-package auto-compile
:demand t
:config

@ -1 +1 @@
Subproject commit d386e9e9bdfc04f5721b10677e5ddf64bb4a032a
Subproject commit 3debf915fbdd9c6d9a014ab0d3f28dd8c998d6c4

@ -1 +1 @@
Subproject commit 1e8a710349da31e81018b7f9ebcab5759b923b14
Subproject commit db22efccdd91974a024eb6f7ddd3b78f499dc7e2

@ -1 +1 @@
Subproject commit 432312b9583ed7b88ad9644fd1bf2183765a892e
Subproject commit 81b1a33b560eeca402745ccff19cdc422e6b22dd

@ -1 +1 @@
Subproject commit 4831933da059ee084a16016558b9ccd8c581a8ff
Subproject commit ebab22e345f489d92b6a2fc179049405344c4d8f

@ -1 +1 @@
Subproject commit 66d9558f4f50332a68213683f7702ca0735f7171
Subproject commit 398990054005d4c348ae50da35190652d8e754dc

@ -1 +1 @@
Subproject commit 60ff82ac7aa8dbc24eb3c34dbed13ad01f20671c
Subproject commit e2060ccb3105555f55992a995587221820341b24

@ -1 +1 @@
Subproject commit d3ace722ea890f9e99054af4487eff65c4e36243
Subproject commit 60c81caac17e6a7ab5bd66df0c981b0530b51586

@ -1 +1 @@
Subproject commit ad5bb005ed3afec2d8b9b2bc1df19fb9b5e2dd84
Subproject commit fb9fdde14eddd5bd180d4baabfedc45e5492e115