# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1269983046 -10800
# Node ID 4cccbd0d68516ef40bc322b0274c8ab9b98da790
# Parent  918a1b3e1a7edb9fb996063a22cd573cc3b6d76f# Parent  514847fa6797f42e9e0c48fd340ea45cb27e0ffa
Automated merge with file:///cygdrive/e/srv/hg/skel

diff -r 918a1b3e1a7e -r 4cccbd0d6851 .vimrc
--- a/.vimrc	Sun Mar 28 22:27:06 2010 +0300
+++ b/.vimrc	Wed Mar 31 00:04:06 2010 +0300
@@ -8,7 +8,9 @@
 " Same as set ts=4, by default - 8, how long TAB.
 set tabstop=4
 " Use spaces instead TAB.
+set expandtab
 set shiftwidth=4
+set softtabstop=4
 set smarttab
 set et