|  | c561bcc2af | Merge branch 'master' of https://github.com/amix/vimrc into amix-master Conflicts:
	.gitignore | 2014-12-16 10:32:49 +08:00 |  | 
			
				
					|  | a340836c8a | . | 2013-12-29 11:33:00 +00:00 |  | 
			
				
					|  | ba783e5fd9 | Added tags | 2013-12-29 10:38:40 +00:00 |  | 
			
				
					|  | 7654d5264c | Added goyo.vim and vim-zenroom2 | 2013-12-29 10:37:14 +00:00 |  | 
			
				
					|  | a448b32309 | Updated plugins | 2013-07-17 19:06:05 -04:00 |  | 
			
				
					|  | 879a7b6bd4 | Added tags (docs) | 2013-05-25 20:32:15 -04:00 |  | 
			
				
					|  | d10a304cd0 | add my config | 2013-05-07 19:13:44 +08:00 |  | 
			
				
					|  | 630b462208 | Updated plugins | 2013-05-04 16:32:47 -04:00 |  | 
			
				
					|  | 687184f0bb | Updated vim plugins | 2013-04-26 13:17:22 -03:00 |  | 
			
				
					|  | 8b5bc388b0 | Added two new plugins: vim-expand-region and vim-multiple-cursors. They are both super useful. Read more on their GitHub pages for more info:
https://github.com/terryma/vim-expand-region
https://github.com/terryma/vim-multiple-cursors | 2013-04-14 12:48:31 -03:00 |  |