diff options
author | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
---|---|---|
committer | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
commit | e2b054c74fd0c1852f94d9af80f44297125742f4 (patch) | |
tree | f7c978cdf3458758f838d60edbb6a54f20f34ea9 /configs/profile/packages.both | |
parent | 04d8551cb78ff9a691fd4ead51e4f8f27c5b851e (diff) | |
parent | 17803d20925a72d31dbdbacf56cb0a7d2db6efcb (diff) |
Merge branch 'rebrand/releng'
Conflicts:
Makefile
configs/profile/build.sh
configs/profile/mkinitcpio.conf
configs/profile/pacman-key-4.0.3_unattended-keyring-init.patch
configs/profile/root-image/root/customize_root_image.sh
configs/profile/root-image/root/install.txt
configs/profile/syslinux/splash.png
Diffstat (limited to 'configs/profile/packages.both')
-rw-r--r-- | configs/profile/packages.both | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configs/profile/packages.both b/configs/profile/packages.both index ade79cf..e269f33 100644 --- a/configs/profile/packages.both +++ b/configs/profile/packages.both @@ -11,16 +11,17 @@ dnsutils dosfstools elinks ethtool +f2fs-tools fsarchiver gnu-netcat +gpm gptfdisk grml-zsh-config -grub-bios +grub haveged hdparm irssi lftp -lilo linux-atm linux-libre-kmod-alx lynx @@ -38,6 +39,7 @@ partclone parted partimage pptpclient +ppp rfkill rp-pppoe rsync |