Merge branch 'master' of ssh://vo20.nl/git/uva

52da9aab · Sander van Veen · 88208a4b · bb5b3d42 · 4911d79e · 52da9aab
Commit 52da9aab authored Nov 03, 2010 by Sander van Veen
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

compilerbouw compilerbouw +1 -1

vim/.vimrc vim/.vimrc +6 -3

No files found.
--- a/compilerbouw @ 4911d79e
+++ b/compilerbouw @ 4911d79e
-Subproject commit 28ecce816a2ffceb9eb23e05b39c4b403bd57539
+Subproject commit 4911d79e41b41212a4b120bb69ee4a6a492d29e8
--- a/vim/.vimrc
+++ b/vim/.vimrc
 set number
-set autoindent
 set incsearch
 set hlsearch
-set tabstop=4
 set ruler
-set shiftwidth=2
+
+set autoindent
+set tabstop=4
+set shiftwidth=4
+set expandtab
+set smarttab

 set modeline