Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/packages/README.md
#	docs/packages/acl/README.md
#	docs/packages/attr/README.md
#	docs/packages/autoconf/README.md
#	docs/packages/automake/README.md
#	docs/packages/bash/README.md
#	docs/packages/bc/README.md
#	docs/packages/binutils-2.37-upstream_fix-1/README.md
#	docs/packages/binutils/README.md
#	docs/packages/bison/README.md
#	docs/packages/bootscripts/README.md
#	docs/packages/bzip2-patch/README.md
#	docs/packages/bzip2/README.md
#	docs/packages/check/README.md
#	docs/packages/coreutils-patch/README.md
#	docs/packages/coreutils/README.md
#	docs/packages/dbus/README.md
#	docs/packages/dejagnu/README.md
#	docs/packages/diffutils/README.md
#	docs/packages/dosfstools/README.md
#	docs/packages/e2fsprogs/README.md
#	docs/packages/efibootmgr/README.md
#	docs/packages/efivar-patch/README.md
#	docs/packages/efivar/README.md
#	docs/packages/elfutils/README.md
#	docs/packages/emacs/README.md
#	docs/packages/eudev/README.md
#	docs/packages/expat/README.md
#	docs/packages/expect/README.md
#	docs/packages/file/README.md
#	docs/packages/findutils/README.md
#	docs/packages/flex/README.md
#	docs/packages/freetype/README.md
#	docs/packages/gawk/README.md
#	docs/packages/gcc/README.md
#	docs/packages/gdbm/README.md
#	docs/packages/gettext/README.md
#	docs/packages/glibc-patch/README.md
#	docs/packages/glibc/README.md
#	docs/packages/gmp/README.md
#	docs/packages/gperf/README.md
#	docs/packages/grep/README.md
#	docs/packages/groff/README.md
#	docs/packages/grub/README.md
#	docs/packages/gzip/README.md
#	docs/packages/iana-etc/README.md
#	docs/packages/inetutils/README.md
#	docs/packages/intltool/README.md
#	docs/packages/iproute2/README.md
#	docs/packages/isl/README.md
#	docs/packages/jinja2/README.md
#	docs/packages/kbd-patch/README.md
#	docs/packages/kbd/README.md
#	docs/packages/kmod/README.md
#	docs/packages/less/README.md
#	docs/packages/libcap/README.md
#	docs/packages/libffi/README.md
#	docs/packages/libpipeline/README.md
#	docs/packages/libtasn1/README.md
#	docs/packages/libtool/README.md
#	docs/packages/linux/README.md
#	docs/packages/m4/README.md
#	docs/packages/make-ca/README.md
#	docs/packages/make/README.md
#	docs/packages/man-db/README.md
#	docs/packages/man-pages/README.md
#	docs/packages/markupsafe/README.md
#	docs/packages/meson/README.md
#	docs/packages/mpc/README.md
#	docs/packages/mpfr/README.md
#	docs/packages/nano/README.md
#	docs/packages/ncurses/README.md
#	docs/packages/ninja/README.md
#	docs/packages/openssl/README.md
#	docs/packages/p11-kit/README.md
#	docs/packages/patch/README.md
#	docs/packages/perl-5.34.0-upstream_fixes-1/README.md
#	docs/packages/perl/README.md
#	docs/packages/pkg-config/README.md
#	docs/packages/popt/README.md
#	docs/packages/procps-ng/README.md
#	docs/packages/psmisc/README.md
#	docs/packages/python/README.md
#	docs/packages/readline/README.md
#	docs/packages/sed/README.md
#	docs/packages/shadow/README.md
#	docs/packages/sysklogd/README.md
#	docs/packages/systemd/README.md
#	docs/packages/sysvinit-patch/README.md
#	docs/packages/sysvinit/README.md
#	docs/packages/tar/README.md
#	docs/packages/tcl/README.md
#	docs/packages/texinfo/README.md
#	docs/packages/tzdata/README.md
#	docs/packages/udev/README.md
#	docs/packages/util-linux/README.md
#	docs/packages/vim/README.md
#	docs/packages/wget/README.md
#	docs/packages/xml-parser/README.md
#	docs/packages/xz/README.md
#	docs/packages/zlib-ng/README.md
#	docs/packages/zstd/README.md
#	docs/sitemap.xml
  • Loading branch information
avmaisak committed Dec 28, 2021
2 parents bd8ffe5 + c47297c commit 290b5de
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 290b5de

Please sign in to comment.