summaryrefslogtreecommitdiff
path: root/extra/git
AgeCommit message (Collapse)Author
2012-12-12Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/btanks/PKGBUILD community/highlight/PKGBUILD community/luaexpat/PKGBUILD community/luakit/PKGBUILD community/luasec/PKGBUILD community/luasocket/PKGBUILD extra/graphviz/PKGBUILD extra/gvfs/PKGBUILD extra/lua/PKGBUILD extra/openal/PKGBUILD extra/sane/PKGBUILD extra/vim/PKGBUILD extra/vlc/PKGBUILD
2012-12-12Wed Dec 12 02:43:53 PST 2012root
2012-11-27Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/spacefm/PKGBUILD extra/eina/PKGBUILD extra/kdeplasma-addons/PKGBUILD
2012-11-27Tue Nov 27 02:14:24 PST 2012root
2012-10-23Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community-staging/cegui/PKGBUILD community-staging/darktable/PKGBUILD community-staging/freewrl/PKGBUILD community-staging/gource/PKGBUILD community-staging/openimageio/PKGBUILD community-staging/rss-glx/PKGBUILD community-staging/spring/PKGBUILD community-testing/virtualbox-modules/PKGBUILD community/astromenace/PKGBUILD extra/di/PKGBUILD staging/opencv/PKGBUILD testing/cairo/PKGBUILD testing/gnome-control-center/PKGBUILD testing/gtkmm3/PKGBUILD testing/seahorse/PKGBUILD testing/systemd/PKGBUILD testing/systemd/systemd.install
2012-10-23Tue Oct 23 01:37:02 PDT 2012root
2012-10-21Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community-staging/projectm/PKGBUILD community-testing/evas_generic_loaders-svn/PKGBUILD community-testing/gambas2/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/libextractor/PKGBUILD community-testing/pdf2djvu/PKGBUILD community-testing/qtcreator/PKGBUILD community-testing/qtcreator/qtcreator.desktop community/galculator/PKGBUILD community/ristretto/PKGBUILD core/systemd/PKGBUILD extra/llvm/PKGBUILD extra/pyqt/PKGBUILD extra/python-lxml/PKGBUILD multilib/lib32-util-linux/PKGBUILD staging/glew/PKGBUILD staging/xine-lib/PKGBUILD testing/calligra/PKGBUILD testing/gdk-pixbuf2/PKGBUILD testing/gdm/PKGBUILD testing/gdm/fix_external_program_directories.patch testing/glib2/PKGBUILD testing/gnome-color-manager/PKGBUILD testing/gthumb/PKGBUILD testing/gtk3/PKGBUILD testing/gvfs/PKGBUILD testing/inkscape/PKGBUILD testing/kdebase-workspace/PKGBUILD testing/libreoffice/PKGBUILD testing/networkmanager/PKGBUILD testing/polkit/PKGBUILD testing/poppler/PKGBUILD testing/rhythmbox/PKGBUILD testing/xorg-server/PKGBUILD testing/xorg-xdm/PKGBUILD
2012-10-19Fri Oct 19 08:15:38 PDT 2012root
2012-10-17Merged upstream, mesa needs revisionNicolás Reynolds
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el Conflicts: community-staging/gigi/PKGBUILD community-staging/lxdm/PKGBUILD community-staging/lxdm/lxdm-pam community-staging/lxdm/lxdm.install community-staging/lxdm/service community-testing/gigi/PKGBUILD community/calf/PKGBUILD community/freedroidrpg/PKGBUILD community/gmic/PKGBUILD community/gnash/PKGBUILD community/prboom/PKGBUILD community/scorched3d/PKGBUILD community/tmux/PKGBUILD community/torcs/PKGBUILD core/curl/PKGBUILD core/systemd/PKGBUILD core/sysvinit/PKGBUILD extra/akonadi/PKGBUILD extra/bzflag/PKGBUILD extra/dhcp/PKGBUILD extra/ftgl/PKGBUILD extra/gcin/PKGBUILD extra/imagemagick/PKGBUILD extra/mesa/PKGBUILD extra/python-telepathy/PKGBUILD extra/qtiplot/PKGBUILD extra/ruby/PKGBUILD extra/wireshark/PKGBUILD extra/xfce4-xkb-plugin/PKGBUILD extra/xine-lib/PKGBUILD extra/xorg-server/PKGBUILD gnome-unstable/at-spi2-atk/PKGBUILD gnome-unstable/at-spi2-core/PKGBUILD gnome-unstable/baobab/PKGBUILD gnome-unstable/epiphany/PKGBUILD gnome-unstable/gdm/PKGBUILD gnome-unstable/glib2/PKGBUILD gnome-unstable/gnome-games/PKGBUILD gnome-unstable/gnome-screensaver/PKGBUILD gnome-unstable/gnome-session/PKGBUILD gnome-unstable/gtk3/PKGBUILD gnome-unstable/libpeas/PKGBUILD gnome-unstable/libsoup/PKGBUILD gnome-unstable/mutter/PKGBUILD gnome-unstable/networkmanager/PKGBUILD multilib/lib32-glew/PKGBUILD multilib/lib32-gnutls/PKGBUILD multilib/lib32-mesa/PKGBUILD multilib/lib32-sqlite/PKGBUILD multilib/wine/PKGBUILD multilib/wine_gecko/PKGBUILD staging/calligra/PKGBUILD staging/inkscape/PKGBUILD staging/kdebase-workspace/PKGBUILD staging/kdebase-workspace/kde-np.pam staging/kdebase-workspace/kde.pam staging/kdebase-workspace/kdm.service staging/libreoffice/PKGBUILD staging/libreoffice/libreoffice-common.csh staging/libreoffice/libreoffice-common.sh staging/poppler/PKGBUILD testing/dbus-python/PKGBUILD testing/e2fsprogs/PKGBUILD testing/iproute2/PKGBUILD testing/iptables/PKGBUILD testing/kdebase-workspace/PKGBUILD testing/kdebase-workspace/kde-np.pam testing/kdebase-workspace/kde.pam testing/kdebindings-python/PKGBUILD testing/lvm2/PKGBUILD testing/lvm2/lvm-on-crypt.service testing/lvm2/lvm.service testing/miro/PKGBUILD testing/postgresql/PKGBUILD testing/postgresql/postgresql.install testing/postgresql/postgresql.service testing/ppp/PKGBUILD testing/ppp/ip-down testing/pyqt/PKGBUILD testing/qscintilla/PKGBUILD testing/sip/PKGBUILD testing/systemd/PKGBUILD testing/systemd/systemd.install testing/util-linux/PKGBUILD testing/wpa_supplicant/PKGBUILD testing/wpa_supplicant/config testing/xf86-video-intel/PKGBUILD
2012-10-14Sun Oct 14 00:45:38 PDT 2012root
2012-10-01Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/geany/PKGBUILD community/linux-tools/PKGBUILD community/linux-tools/cpupower.conf community/linux-tools/cpupower.rc community/stk/PKGBUILD core/patch/PKGBUILD core/systemd/PKGBUILD extra/lftp/PKGBUILD extra/lftp/lftp-4.3.8-gets.patch extra/mysql/PKGBUILD extra/qt/PKGBUILD extra/transmission/PKGBUILD gnome-unstable/gcr/PKGBUILD gnome-unstable/glibmm/PKGBUILD gnome-unstable/gnome-session/PKGBUILD gnome-unstable/libgdata/PKGBUILD gnome-unstable/libgnome-keyring/PKGBUILD gnome-unstable/pango/PKGBUILD gnome-unstable/polkit/PKGBUILD gnome-unstable/telepathy-glib/PKGBUILD libre/linux-libre/PKGBUILD multilib/lib32-libphobos-ldc/PKGBUILD multilib/wine/PKGBUILD testing/dbus-core/PKGBUILD testing/dbus/PKGBUILD testing/libusbx/PKGBUILD testing/systemd/PKGBUILD testing/xf86-video-intel/PKGBUILD
2012-10-01Mon Oct 1 00:42:09 PDT 2012root
2012-09-21Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/midori/PKGBUILD extra/libffado/PKGBUILD gnome-unstable/eog/PKGBUILD gnome-unstable/gnome-settings-daemon/PKGBUILD testing/util-linux/PKGBUILD
2012-09-21Fri Sep 21 00:28:30 PDT 2012root
2012-08-23Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/projectm/PKGBUILD
2012-08-23Thu Aug 23 00:03:08 UTC 2012root
2012-08-19Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community-staging/r8168-lts/PKGBUILD community-testing/evas_generic_loaders-svn/PKGBUILD community-testing/gambas2/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/libextractor/PKGBUILD community-testing/pdf2djvu/PKGBUILD community-testing/r8168-lts/PKGBUILD community-testing/sage-mathematics/PKGBUILD community/ruby-gtk2/PKGBUILD core/dhcpcd/PKGBUILD core/glibc/PKGBUILD core/net-tools/PKGBUILD cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD extra/cups/PKGBUILD extra/maxima/PKGBUILD extra/scim-hangul/PKGBUILD extra/speech-dispatcher/PKGBUILD extra/subversion/PKGBUILD extra/telepathy-idle/PKGBUILD extra/x11vnc/PKGBUILD multilib-testing/binutils-multilib/PKGBUILD multilib-testing/gcc-multilib/PKGBUILD multilib-testing/lib32-glibc/PKGBUILD multilib/binutils-multilib/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-glibc/PKGBUILD multilib/lib32-krb5/PKGBUILD multilib/lib32-libdrm/PKGBUILD multilib/lib32-libxml2/PKGBUILD multilib/lib32-libxrandr/PKGBUILD multilib/lib32-p11-kit/PKGBUILD testing/binutils/PKGBUILD testing/calligra/PKGBUILD testing/dhcp/PKGBUILD testing/gcc/PKGBUILD testing/glibc/PKGBUILD testing/inkscape/PKGBUILD testing/iproute2/PKGBUILD testing/libreoffice/PKGBUILD testing/libreoffice/PKGBUILD.36 testing/poppler/PKGBUILD
2012-08-17Fri Aug 17 00:02:30 UTC 2012root
2012-08-01Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community-testing/cdfs/PKGBUILD community-testing/vhba-module/PKGBUILD community-testing/vhba-module/vhba-module.install community/apcupsd/PKGBUILD community/aspell-ca/PKGBUILD core/systemd/PKGBUILD extra/dhcp/PKGBUILD libre/virtualbox-libre/PKGBUILD staging/calligra/PKGBUILD testing/bison/PKGBUILD
2012-08-01Wed Aug 1 00:01:57 UTC 2012root
2012-07-27Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community-staging/kdenlive/PKGBUILD community-staging/openscenegraph/PKGBUILD community-staging/schroot/PKGBUILD community-staging/wt/PKGBUILD community-testing/cdfs/PKGBUILD community-testing/pingus/PKGBUILD community-testing/tagpy/PKGBUILD community-testing/vhba-module/PKGBUILD community-testing/vhba-module/vhba-module.install community/surf/PKGBUILD community/unpaper/PKGBUILD core/flex/PKGBUILD core/gcc/PKGBUILD extra/boost/PKGBUILD extra/cups/PKGBUILD extra/gnutls/PKGBUILD extra/gtk2/PKGBUILD extra/llvm/PKGBUILD extra/mesa/PKGBUILD extra/qt/PKGBUILD kde-unstable/akonadi/PKGBUILD kde-unstable/kdeplasma-addons/PKGBUILD libre/virtualbox-libre/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-libpng/PKGBUILD testing/bind/PKGBUILD testing/dnsutils/PKGBUILD testing/iptables/PKGBUILD testing/nouveau-dri/PKGBUILD
2012-07-25Wed Jul 25 00:01:50 UTC 2012root
2012-07-17Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community-testing/electricsheep/PKGBUILD community-testing/gnash/PKGBUILD community-testing/performous/PKGBUILD community/drbd/PKGBUILD community/oss/PKGBUILD community/pinot/PKGBUILD core/glibc/PKGBUILD core/kmod/PKGBUILD core/pkg-config/PKGBUILD core/systemd/PKGBUILD extra/bitlbee/PKGBUILD extra/mesa/PKGBUILD extra/nettle/PKGBUILD extra/xfce4-netload-plugin/PKGBUILD kde-unstable/kdepim/PKGBUILD multilib/lib32-glibc/PKGBUILD multilib/lib32-mesa/PKGBUILD multilib/lib32-mpg123/PKGBUILD multilib/lib32-nettle/PKGBUILD multilib/lib32-nouveau-dri/PKGBUILD multilib/lib32-pcre/PKGBUILD multilib/lib32-readline/PKGBUILD multilib/zsnes/PKGBUILD multilib/zsnes/zsnes.patch testing/cryptsetup/PKGBUILD testing/ekiga/PKGBUILD testing/iputils/PKGBUILD testing/poppler/PKGBUILD testing/util-linux/PKGBUILD testing/util-linux/util-linux.install
2012-07-15Sun Jul 15 00:03:24 UTC 2012root
2012-06-27Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/moreutils/PKGBUILD core/iputils/PKGBUILD libre/texlive-bin-libre/PKGBUILD testing/openldap/PKGBUILD
2012-06-27Wed Jun 27 00:01:57 UTC 2012root
2012-06-20Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community-staging/nginx/PKGBUILD community/remmina/PKGBUILD extra/doxygen/PKGBUILD kde-unstable/libkgapi/PKGBUILD testing/psmisc/PKGBUILD
2012-06-20Wed Jun 20 00:01:41 UTC 2012root
2012-06-08Fri Jun 8 19:39:26 UTC 2012root
2012-06-08Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community-staging/kid3/kid3.install community/cherokee/PKGBUILD community/supercollider/supercollider.install core/libusb/PKGBUILD core/systemd/PKGBUILD core/udev/PKGBUILD extra/gimp-devel/PKGBUILD extra/maxima/PKGBUILD libre/kdenetwork-kopete-libre/PKGBUILD staging/kdebase-workspace/kdm staging/kdebindings-perlkde/PKGBUILD staging/kdebindings-perlqt/PKGBUILD staging/kdemultimedia/PKGBUILD staging/kdenetwork/PKGBUILD staging/kdeplasma-addons/kdeplasma-addons-applets.install
2012-05-31Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community-testing/libvirt/PKGBUILD community/opendkim/opendkim.rc core/nfs-utils/blkmapd.service multilib/lib32-glib2/PKGBUILD multilib/lib32-libssh2/PKGBUILD multilib/lib32-libx11/PKGBUILD multilib/lib32-qt/PKGBUILD testing/php/PKGBUILD testing/xorg-server/PKGBUILD ~fauno/notmuch/PKGBUILD
2012-05-31Thu May 31 16:24:59 UTC 2012root
2012-05-14Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/openbox/PKGBUILD community/powertop/PKGBUILD core/libusb-compat/PKGBUILD core/openssl/PKGBUILD extra/libvpx/PKGBUILD extra/php-apc/PKGBUILD extra/pidgin/PKGBUILD extra/pulseaudio/PKGBUILD extra/pygobject/PKGBUILD extra/xfce4-genmon-plugin/PKGBUILD extra/xorg-server/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-cairo/PKGBUILD multilib/lib32-glib2/PKGBUILD multilib/lib32-libffi/PKGBUILD multilib/lib32-libpulse/PKGBUILD multilib/lib32-llvm/PKGBUILD multilib/wine/PKGBUILD testing/mdadm/PKGBUILD testing/php/PKGBUILD testing/xorg-server/PKGBUILD testing/xorg-server/git-fixes.patch
2012-05-13Sun May 13 00:05:24 UTC 2012root
2012-05-04Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/lazarus/PKGBUILD extra/msmtp/PKGBUILD multilib/jack2-multilib/PKGBUILD testing/glib2/PKGBUILD testing/lvm2/PKGBUILD testing/mdadm/PKGBUILD testing/mdadm/mdadm testing/mdadm/mdadm_hook testing/mdadm/mdadm_udev_install testing/systemd/PKGBUILD testing/systemd/systemd.install
2012-05-04Fri May 4 00:01:56 UTC 2012root
2012-04-07Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/gnustep-make/PKGBUILD extra/foomatic/PKGBUILD extra/gnutls/PKGBUILD libre/gstreamer0.10-bad-libre/PKGBUILD multilib/lib32-gnutls/PKGBUILD staging/libreoffice/PKGBUILD testing/udev/PKGBUILD
2012-04-08Sun Apr 8 00:02:42 UTC 2012root
2012-04-05Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: core/expat/PKGBUILD core/gcc/PKGBUILD core/glibc/PKGBUILD core/libtool/PKGBUILD core/wpa_actiond/PKGBUILD libre/linux-libre/PKGBUILD multilib/binutils-multilib/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/gcc-multilib/gcc_pure64-multilib.patch multilib/lib32-glibc/PKGBUILD multilib/lib32-glibc/glibc-2.15-vfprintf-nargs.patch multilib/lib32-glibc/glibc-__i686.patch multilib/libtool-multilib/PKGBUILD staging/kdebase-workspace/PKGBUILD staging/kdepim-runtime/PKGBUILD testing/telepathy-gabble/PKGBUILD testing/telepathy-glib/PKGBUILD testing/telepathy-mission-control/PKGBUILD
2012-04-05Thu Apr 5 00:01:22 UTC 2012root
2012-03-28Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: core/gnupg/PKGBUILD core/openldap/PKGBUILD gnome-unstable/evince/PKGBUILD gnome-unstable/evolution-data-server/PKGBUILD gnome-unstable/evolution/PKGBUILD gnome-unstable/farstream/PKGBUILD gnome-unstable/gnome-desktop/PKGBUILD gnome-unstable/gnome-menus/PKGBUILD gnome-unstable/gnome-panel/PKGBUILD gnome-unstable/gtkhtml4/PKGBUILD gnome-unstable/libgnomekbd/PKGBUILD gnome-unstable/libwacom/PKGBUILD gnome-unstable/libwnck3/PKGBUILD gnome-unstable/network-manager-applet/PKGBUILD gnome-unstable/networkmanager-openconnect/PKGBUILD gnome-unstable/networkmanager-openvpn/PKGBUILD gnome-unstable/networkmanager-pptp/PKGBUILD gnome-unstable/networkmanager-vpnc/PKGBUILD gnome-unstable/networkmanager/PKGBUILD gnome-unstable/pidgin/PKGBUILD testing/gnupg/PKGBUILD
2012-03-29Thu Mar 29 00:01:17 UTC 2012root
2012-03-14Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/aspell-ca/PKGBUILD community/corkscrew/PKGBUILD cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD extra/gstreamer0.10-base/PKGBUILD extra/gstreamer0.10-good/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/libxi/PKGBUILD extra/mesa/PKGBUILD extra/mkvtoolnix/PKGBUILD extra/mpc/PKGBUILD extra/poppler/PKGBUILD extra/xf86-video-siliconmotion/PKGBUILD extra/xorg-server/PKGBUILD gnome-unstable/gconf/PKGBUILD gnome-unstable/gnome-desktop/PKGBUILD gnome-unstable/network-manager-applet/PKGBUILD gnome-unstable/vte3/PKGBUILD multilib/chuck/PKGBUILD multilib/lib32-libpciaccess/PKGBUILD multilib/lib32-libx11/PKGBUILD multilib/lib32-libxcb/PKGBUILD multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch multilib/lib32-libxft/PKGBUILD multilib/lib32-libxi/PKGBUILD multilib/lib32-llvm/PKGBUILD multilib/lib32-mesa/PKGBUILD testing/grep/PKGBUILD testing/sudo/PKGBUILD testing/xf86-input-joystick/PKGBUILD testing/xf86-input-wacom/PKGBUILD
2012-03-14Wed Mar 14 00:01:29 UTC 2012root
2012-03-09Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/recoll/PKGBUILD core/dnsutils/PKGBUILD core/tzdata/PKGBUILD extra/cabal-install/PKGBUILD extra/feh/PKGBUILD extra/icedtea-web/PKGBUILD extra/indent/PKGBUILD extra/kdebase-konsole/PKGBUILD extra/kdebase-runtime/PKGBUILD extra/kdebase-workspace/PKGBUILD extra/kdepim/PKGBUILD extra/kdesdk/PKGBUILD extra/ktorrent/PKGBUILD extra/libktorrent/PKGBUILD libre/mplayer-libre/PKGBUILD multilib/lib32-libxau/PKGBUILD multilib/lib32-mpg123/PKGBUILD multilib/wine/PKGBUILD staging/kdenetwork/PKGBUILD staging/kdepim/PKGBUILD testing/bluez/PKGBUILD testing/xf86-input-evdev/PKGBUILD
2012-03-08Thu Mar 8 00:01:27 UTC 2012root
2012-02-24Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/arpack/PKGBUILD community/flac123/PKGBUILD community/flashrom/PKGBUILD community/liblockfile/PKGBUILD community/python-cjson/PKGBUILD community/tcpflow/PKGBUILD extra/vlc/PKGBUILD multilib/lib32-gnutls/PKGBUILD multilib/lib32-libssh2/PKGBUILD
2012-02-23Thu Feb 23 23:15:11 UTC 2012root
2012-02-15Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolas Reynolds
Conflicts: community/binutils-avr/PKGBUILD community/freecol/PKGBUILD community/gcc-avr/PKGBUILD community/lightspark/PKGBUILD community/lorcon-old-svn/PKGBUILD community/mdf2iso/PKGBUILD community/pylorcon/PKGBUILD community/qbittorrent/PKGBUILD community/remmina-plugins/PKGBUILD community/systemd/PKGBUILD community/texmaker/PKGBUILD extra/pyqt/PKGBUILD extra/uim/PKGBUILD extra/wesnoth/PKGBUILD libre/kdenetwork-libre/PKGBUILD multilib-testing/lib32-glibc/PKGBUILD multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch multilib-testing/lib32-libxcb/PKGBUILD multilib/libtool-multilib/PKGBUILD multilib/libtool-multilib/libtool.install testing/glibc/PKGBUILD testing/shadow/PKGBUILD testing/xf86-video-savage/PKGBUILD
2012-02-15Wed Feb 15 20:35:25 UTC 2012root