Merge branch 'master' of https://github.com/sorin-ionescu/prezto into gpg-ssh-fix

This commit is contained in:
Adam Goldsmith 2015-05-03 16:54:29 -04:00
commit 9f5301e16f
3 changed files with 3 additions and 3 deletions

@ -1 +1 @@
Subproject commit 6d7bc718aee81b9afa9e146b5567be014b3ff8f0
Subproject commit c4a83561a12b898ff7145856d0e6ae50757e28ba

@ -1 +1 @@
Subproject commit ef1329909a3c72bb76765ccc519214ce60cedddb
Subproject commit 5ade8aeb8a7d45a59841278a9a86090dd880be63

View File

@ -74,4 +74,4 @@ Authors
[4]: https://github.com/mxcl/homebrew
[5]: https://github.com/sorin-ionescu/prezto/issues
[6]: http://iterm2.com
[7]: https://code.google.com/p/iterm2/wiki/TmuxIntegration
[7]: https://gitlab.com/gnachman/iterm2/wikis/TmuxIntegration