From: Frank Brehm Date: Wed, 13 Nov 2013 19:37:17 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=1196c8f16751d7d6d8ccf14fc4e34bf15df8e191;p=config%2Fhelga%2Fetc.git Current state --- diff --git a/portage b/portage index 9356b98..8e497bc 160000 --- a/portage +++ b/portage @@ -1 +1 @@ -Subproject commit 9356b98c10f0d44e38a0e515ad0cd15c2271b4a3 +Subproject commit 8e497bc444a6aee7605522fa5eeb8e944fb098f0 diff --git a/resolv.conf b/resolv.conf index ddabc21..7704d3e 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,6 +1,6 @@ # Generated by net-scripts for interface eth0 domain brehm-online.com -search brehm-online.com brehm-online.eu brehm-berlin.de serverkompetenz.net +search brehm-online.com uhu-banane.de serverkompetenz.net nameserver 127.0.0.1 nameserver 81.169.163.106 nameserver 85.214.7.22 diff --git a/shadow b/shadow index 61e78a7..0fb0f19 100644 --- a/shadow +++ b/shadow @@ -47,7 +47,7 @@ doris:$6$ytvH/1Wr$TBx1U/JLr62XC5slXfmU3fm1qz8wDqS5Awa23RYk7yxNTYEuRukEOOyq6wGhoB davis:$1$3T8Trt8I$msRWT6I6Th7I4Oh/ZPJ5L0:14756:0:99999:7::: thomas:$1$0XWKbUsf$U73Y/KdvYm6RVQMwMUowF0:14756:0:99999:7::: vmail:$1$PlXil62T$WTZDda6da9pKsgvD3S4vu.:14756:0:99999:7::: -alfred:$6$7QGTopxZ$8cZaNAdFh9HPzgmo2J1klt1pXKacybRWfp3BnTY3q8ufnp8lNYFEdstvxgHD9iqSL8FpvrsGeC3V3BXhgzZO/.:14756:0:99999:7::: +alfred:$6$E1VSkGen$H9o/FC.vFflMal5iSa8U2XPUspwfMXMyGmwErJTzMXGAMcdhCOn9GeCGbKtXF7JDcyDKGj1TeOuvWPNC3GvyP/:16004:0:99999:7::: steffen:$6$hjuxkJql$9/ANdpksdci1A40kjix8xMXEnrhCeGlfGxHxsWHADY44Xe.NY0sahgAzIAhTtX5/gIaCoTU37z2QbHCoBPy5k0:14756:0:99999:7::: heiko:$1$OcX7G9Sq$YjjhAKtIp7UyxeZuHysq7/:14756:0:99999:7::: ulogd:!:15545:::::: diff --git a/vim/vimrc.local b/vim/vimrc.local index bcb8022..b880ceb 100644 --- a/vim/vimrc.local +++ b/vim/vimrc.local @@ -4,7 +4,7 @@ set fo="tcq" set modeline set showmatch -set list listchars=tab:»·,trail:· +"set list listchars=tab:»·,trail:· if has("multi_byte") set encoding=utf-8