Merge.
| author |
Steve Losh <steve@stevelosh.com> |
| date |
Fri, 24 Nov 2017 15:05:53 -0500 |
| parents |
1cd90a0458e4 |
| children |
28205343c464 3277da5053a6 |
4dddc56c4c4b420c91d4a9b20e8f9589953b3fde mercurial/hg-prompt
1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 mercurial/templates
b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd vim/bundle/abolish
a16a9b63eb85cc0960a7f25c54647ac1f99f3360 vim/bundle/ack
5e4a535e2d239cba3db19b6b79abedbc7c541727 vim/bundle/badwolf
a4d79fc208764917cb58e2aed6fbaeb5e3356d33 vim/bundle/clam
f1c53e290b16885c2eb3fc96e57d9984b627f735 vim/bundle/clojure-static
be79030b3e8c0ee3c5f45b4333919e4830531e80 vim/bundle/commentary
c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2 vim/bundle/ctrlp
38487bbec8ba50834e257940b357de03991fa8f9 vim/bundle/delimitmate
6dd4480388e4727dfe5c723484c500e03b429c28 vim/bundle/dispatch
1c75b56ceb96a6e7fb6708ae96ab63b3023bab2f vim/bundle/fireplace
8f60d1d459362771cb68c0097565efdf52e62ec3 vim/bundle/fugitive
127d706f2def96876605e6bd5d366c973cb8e406 vim/bundle/gdl
6ea4e1983b18cf440c8f800a3e94b57338a3e99f vim/bundle/glsl
0d57b080f9fae8573c688b6679b31eb1666edc4c vim/bundle/gnuplot
1d84591fff04caebab75cba2294fc3843f0a4a29 vim/bundle/gundo
fccd580f5f11d576169ee347907c9fbd77af410a vim/bundle/html5
78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
395f8901b34cc871c9576886938a6efda0eb7268 vim/bundle/javascript
dcdab0cd55da5e0b8655c000d99d96624cd6404c vim/bundle/markdown
528e111b9fa32452366f382d50e998536d3ded85 vim/bundle/miniyank
a1433c485eb254838c1db52e087d5ec4d1e77cfd vim/bundle/nerdtree
160b717feddd46bfd580bf23198c92fd039c4d2e vim/bundle/omnisharp-vim
f506af01e84e53643e0760b7f43c74069ce16c85 vim/bundle/paredit
1a436f7d875b4ec630da081b041c73264235c7e7 vim/bundle/pgsql
fd70ac2ab74a91fb049cb8e82237c34d88354673 vim/bundle/python-mode
eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 vim/bundle/rainbow-parentheses
7a6675f092842c8f81e71d5345bd7cdbf3759415 vim/bundle/repeat
6caad2b61afcc1b7c476b0ae3dea9ee5f2b1d14a vim/bundle/rhubarb
e7640f26e56f0be344d60a6098e05d6928fd396d vim/bundle/scala
10d6c6b52fcdd12f3ba457126f66fee4ccceec04 vim/bundle/securemodelines
b4398689f7483b01684044ab6b55bf369744c9b3 vim/bundle/sexp
e02c3e218c51c1e2ea1821a3fe412d4e09ca1502 vim/bundle/shaderhighlight
062b18eebd153c13e6f36577707acb17893cd959 vim/bundle/splice
26fbdd7d1f1aa5600d2ebf39bbdd292c38aac16e vim/bundle/strftimedammit
2d05440ad23f97a7874ebd9b5de3a0e65d25d85c vim/bundle/surround
19c3d966440b6cfe8d74251881a48e961ddb8648 vim/bundle/swig
cd871da6b4515e393ec0ba885423594447980e09 vim/bundle/syntastic
f6f2d6618a321f5b0065586a7bc934325fec81ab vim/bundle/targets
5d5c71044880443035e07009497962feacb56b20 vim/bundle/vimtex
bf3fd7f67e730f93765bd3c1cfcdb18fd4043521 vim/bundle/vitality
065b95f3ac7a455314c2bdefeb2b792f290034df vim/bundle/vlime
6876fe38b33732cb124d415ffc4156f16da5e118 vim/bundle/windowswap