Browse files

Merge branch 'master' of github.com:jamesmartin/dotfiles

  • Loading branch information...
2 parents 61d97bb + d6508b8 commit c7e38ef097fb1dd230dc3b7e6e4b895634496d13 James Martin committed Jun 6, 2011
View
4 vim/.VimballRecord
@@ -1,2 +1,6 @@
vimwiki_0_9_701.vba: call delete('/Users/jma/.vim/autoload/vimwiki.vim')|call delete('/Users/jma/.vim/autoload/vimwiki_html.vim')|call delete('/Users/jma/.vim/autoload/vimwiki_lst.vim')|call delete('/Users/jma/.vim/doc/vimwiki.txt')|call delete('/Users/jma/.vim/ftplugin/vimwiki.vim')|call delete('/Users/jma/.vim/plugin/vimwiki.vim')|call delete('/Users/jma/.vim/syntax/vimwiki.vim')|call delete('/Users/jma/.vim/syntax/vimwiki_default.vim')|call delete('/Users/jma/.vim/syntax/vimwiki_media.vim')
+<<<<<<< HEAD
+command-t-1.1b2.vba: call delete('/Users/jamesmartin/.vim/ruby/command-t/controller.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/extconf.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/finder/buffer_finder.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/finder/file_finder.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/finder.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/match_window.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/prompt.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/scanner/buffer_scanner.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/scanner/file_scanner.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/scanner.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/settings.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/stub.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/vim/path_utilities.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/vim/screen.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/vim/window.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/vim.rb')|call delete('/Users/jamesmartin/.vim/ruby/command-t/ext.c')|call delete('/Users/jamesmartin/.vim/ruby/command-t/match.c')|call delete('/Users/jamesmartin/.vim/ruby/command-t/matcher.c')|call delete('/Users/jamesmartin/.vim/ruby/command-t/ext.h')|call delete('/Users/jamesmartin/.vim/ruby/command-t/match.h')|call delete('/Users/jamesmartin/.vim/ruby/command-t/matcher.h')|call delete('/Users/jamesmartin/.vim/ruby/command-t/ruby_compat.h')|call delete('/Users/jamesmartin/.vim/ruby/command-t/depend')|call delete('/Users/jamesmartin/.vim/doc/command-t.txt')|call delete('/Users/jamesmartin/.vim/plugin/command-t.vim')
+=======
command-t-1.1b.vba: call delete('/Users/jmrtn/.vim/ruby/command-t/controller.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/extconf.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/finder/buffer_finder.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/finder/file_finder.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/finder.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/match_window.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/prompt.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/scanner/buffer_scanner.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/scanner/file_scanner.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/scanner.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/settings.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/stub.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/vim/path_utilities.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/vim/screen.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/vim/window.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/vim.rb')|call delete('/Users/jmrtn/.vim/ruby/command-t/ext.c')|call delete('/Users/jmrtn/.vim/ruby/command-t/match.c')|call delete('/Users/jmrtn/.vim/ruby/command-t/matcher.c')|call delete('/Users/jmrtn/.vim/ruby/command-t/ext.h')|call delete('/Users/jmrtn/.vim/ruby/command-t/match.h')|call delete('/Users/jmrtn/.vim/ruby/command-t/matcher.h')|call delete('/Users/jmrtn/.vim/ruby/command-t/ruby_compat.h')|call delete('/Users/jmrtn/.vim/ruby/command-t/depend')|call delete('/Users/jmrtn/.vim/doc/command-t.txt')|call delete('/Users/jmrtn/.vim/plugin/command-t.vim')
+>>>>>>> 922845a05edfcfa3fbf8def4e4cc05d9c45c9c64
View
8 vim/doc/command-t.txt
@@ -637,6 +637,14 @@ POSSIBILITY OF SUCH DAMAGE.
HISTORY *command-t-history*
+<<<<<<< HEAD
+1.1b2 (26 March 2011)
+
+- fix a glitch in the release process; the plugin itself is unchanged since
+ 1.1b
+
+=======
+>>>>>>> 922845a05edfcfa3fbf8def4e4cc05d9c45c9c64
1.1b (26 March 2011)
- add |:CommandTBuffer| command for quickly selecting among open buffers
View
BIN vim/ruby/command-t/ext.bundle
Binary file not shown.
View
BIN vim/ruby/command-t/ext.o
Binary file not shown.
View
BIN vim/ruby/command-t/match.o
Binary file not shown.
View
BIN vim/ruby/command-t/matcher.o
Binary file not shown.
View
1 vimrc
@@ -136,6 +136,7 @@ set foldlevel=1
let mapleader= ","
" Professor VIM says '87% of users prefer jj over esc', jj abrams disagrees
+let mapleader = ","
imap jj <Esc>
imap uu _
imap hh =>

0 comments on commit c7e38ef

Please sign in to comment.