myconfig

my config files
git clone https://a3nm.net/git/myconfig/
Log | Files | Refs | README

commit 3375add3a1963c35a81a9f2df38835c59d75e1b2
parent 2c54f823f5f7f3cb6cd9ac9c4dbaf1330fdf455b
Author: Antoine Amarilli <a3nm@a3nm.net>
Date:   Wed,  9 May 2012 15:30:17 +0200

Merge branch 'master' of alpha:git/config, update packages

Conflicts:
	TODO

Diffstat:
TODO | 7++++++-
packages | 3---
packages_external | 3+++
3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/TODO b/TODO @@ -1,3 +1,8 @@ cleanup xmodmaprc, compile it to a console keymap crontab -stuff from eta +openvpn setup in /etc/hosts +openvpn setup +ssh setup +add scripts +apt-mark showmanual | sudo xargs apt-mark auto +cat packages | sudo xargs apt-mark manual diff --git a/packages b/packages @@ -400,7 +400,6 @@ libtinfo-dev libunique-dev libv4l-dev libwebkit-dev -libwine-dev-unstable libx11-dev libxapian-dev libxi-dev @@ -711,8 +710,6 @@ whois wicd wicd-curses wikipediafs -wine-bin-unstable -wine-unstable wireless-regdb wireless-tools wireshark diff --git a/packages_external b/packages_external @@ -1 +1,4 @@ bitcoin-cli +libwine-dev-unstable +wine-bin-unstable +wine-unstable