diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2011-12-11 17:07:13 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2011-12-11 17:07:13 +0000 |
| commit | b837d3fe7b2ded5ced7389896a5faf15b12ba685 (patch) | |
| tree | 178186fdfdc973dcf43a77975324f2d6340db69a | |
| parent | 67af8a7a0619619600d8b4af2f73a942de2f20df (diff) | |
| parent | 0c5d733db74cad4285bc792567963c45a0b7ba2d (diff) | |
| download | aports-b837d3fe7b2ded5ced7389896a5faf15b12ba685.tar.bz2 aports-b837d3fe7b2ded5ced7389896a5faf15b12ba685.tar.xz | |
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports-amanison
Conflicts:
acceptable-package-list.txt
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | acceptable-package-list.txt | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 9d9743a23..5a02c25b7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,10 +4,14 @@ *.bz2 *.tbz2 *.zip +*.tags +*.xz src pkg pkg-* main/vim/7.2.* +main/bash/bash42-0* +main/busybox/busybox-*.patch main_*.txt testing_*.txt unstable_*.txt diff --git a/acceptable-package-list.txt b/acceptable-package-list.txt index a7e62f95b..99d3a2138 100644 --- a/acceptable-package-list.txt +++ b/acceptable-package-list.txt @@ -1,4 +1,8 @@ busybox-initscripts +<<<<<<< HEAD +======= +abuildhelper +>>>>>>> 0c5d733db74cad4285bc792567963c45a0b7ba2d file libcap alpine-baselayout @@ -53,3 +57,11 @@ libbz2 cdrkit acct alpine-sdk +<<<<<<< HEAD +======= +squashfs-tools +xz-libs +lzo +libssh2 +libattr +>>>>>>> 0c5d733db74cad4285bc792567963c45a0b7ba2d |