Merge branch 'master' of vcs.fsf.org:fai-configs
[fai-configs.git] / package_config / MV
index d6d567e..d77fdb3 100644 (file)
@@ -2,9 +2,14 @@ PACKAGES aptitude MV
 openbox
 obmenu
 obconf
-<<<<<<< HEAD
-wicd
+wicd-gtk
 openbox-themes
-=======
 bind9
->>>>>>> becb639a7cbbd2e939d018df7a0ae305b906b086
+gmrun
+tint2
+xfce4-screenshooter
+conky
+clipit
+guake
+nitrogen
+emacs-goodies-el
\ No newline at end of file