summaryrefslogtreecommitdiff
path: root/staging/glibc
AgeCommit message (Collapse)Author
2012-08-28Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community-staging/widelands/PKGBUILD community/bird/PKGBUILD community/hwinfo/PKGBUILD community/pdnsd/PKGBUILD community/spectrwm/PKGBUILD community/xmlrpc-c/PKGBUILD core/wireless_tools/PKGBUILD extra/proftpd/PKGBUILD libre/grub/PKGBUILD multilib-testing/lib32-libdrm/PKGBUILD multilib-testing/lib32-libdrm/no-pthread-stubs.patch multilib/lib32-gdk-pixbuf2/PKGBUILD testing/pkg-config/PKGBUILD testing/systemd/PKGBUILD testing/systemd/systemd.install
2012-08-13Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/bird/PKGBUILD community/ecryptfs-utils/PKGBUILD community/linux-tools/PKGBUILD community/qtcurve-kde4/PKGBUILD extra/audacity/PKGBUILD extra/cups/PKGBUILD extra/imagemagick/PKGBUILD extra/kdeadmin/PKGBUILD extra/kdepim/PKGBUILD extra/kradio/PKGBUILD extra/libimobiledevice/PKGBUILD extra/libmowgli/PKGBUILD extra/llvm/PKGBUILD extra/phonon-vlc/PKGBUILD extra/pycrypto/PKGBUILD extra/xorg-server/PKGBUILD libre/linux-libre/PKGBUILD libre/syslinux/PKGBUILD multilib-staging/gcc-multilib/PKGBUILD multilib/lib32-libldap/PKGBUILD staging/binutils/PKGBUILD staging/gcc/PKGBUILD staging/glibc/PKGBUILD testing/cronie/PKGBUILD testing/cryptsetup/PKGBUILD testing/krb5/PKGBUILD testing/lvm2/PKGBUILD testing/net-tools/PKGBUILD testing/systemd/PKGBUILD
2012-08-13Mon Aug 13 00:02:34 UTC 2012root
2012-07-04Wed Jul 4 00:01:59 UTC 2012root
2012-06-14Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community-staging/mplayer2/PKGBUILD community/pcmanfm/PKGBUILD extra/liblrdf/PKGBUILD extra/php-apc/PKGBUILD extra/sqlite/PKGBUILD kde-unstable/libkgapi/PKGBUILD kde-unstable/soprano/PKGBUILD multilib/lib32-libphobos-ldc/PKGBUILD multilib/lib32-pixman/PKGBUILD multilib/lib32-sqlite3/PKGBUILD
2012-06-11Mon Jun 11 00:02:18 UTC 2012root