summaryrefslogtreecommitdiff
path: root/extra/git
AgeCommit message (Collapse)Author
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
2012-02-13Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolas Reynolds
Conflicts: community/ccze/PKGBUILD community/remind/PKGBUILD core/iw/PKGBUILD core/less/PKGBUILD extra/davfs2/PKGBUILD extra/ettercap/PKGBUILD extra/gtk-xfce-engine/PKGBUILD extra/imagemagick/PKGBUILD extra/kismet/PKGBUILD extra/libmp3splt/PKGBUILD extra/php/PKGBUILD extra/xfce4-verve-plugin/PKGBUILD multilib/lib32-glib2/PKGBUILD multilib/lib32-pcre/PKGBUILD multilib/wine/PKGBUILD staging/xorg-server/PKGBUILD
2012-02-12Sun Feb 12 23:15:07 UTC 2012root
2012-01-31Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: extra/xorg-server/PKGBUILD multilib-staging/lib32-pango/PKGBUILD multilib/lib32-gtk2/PKGBUILD staging/digikam/PKGBUILD testing/udev/PKGBUILD
2012-01-30Mon Jan 30 23:15:08 UTC 2012root
2012-01-20Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolas Reynolds
Conflicts: community/gnash/PKGBUILD community/libopenraw/PKGBUILD community/smalltalk/PKGBUILD core/coreutils/PKGBUILD core/libarchive/PKGBUILD extra/dhcp/PKGBUILD extra/gmime/PKGBUILD extra/gvfs/PKGBUILD extra/kdeutils/PKGBUILD extra/libreoffice/PKGBUILD extra/lirc/PKGBUILD extra/php-suhosin/PKGBUILD extra/qtwebkit/PKGBUILD extra/sdl_image/PKGBUILD extra/sdl_net/PKGBUILD extra/sdl_ttf/PKGBUILD extra/spamassassin/PKGBUILD extra/tftp-hpa/PKGBUILD extra/totem-plparser/PKGBUILD extra/tumbler/PKGBUILD extra/vim/PKGBUILD extra/wipe/PKGBUILD extra/xfce4-netload-plugin/PKGBUILD kde-unstable/kdebase-workspace/PKGBUILD kde-unstable/kdebase-workspace/kde-np.pam kde-unstable/kdebase-workspace/kde.pam multilib/binutils-multilib/PKGBUILD multilib/chuck/PKGBUILD multilib/dev86/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/jack2-multilib/PKGBUILD multilib/lib32-gdk-pixbuf2/PKGBUILD multilib/lib32-glib2/PKGBUILD multilib/lib32-glibc/PKGBUILD multilib/lib32-glibc/lib32-glibc.conf multilib/lib32-gtk2/PKGBUILD multilib/lib32-libpulse/PKGBUILD multilib/lib32-pango/PKGBUILD multilib/lib32-sdl_image/PKGBUILD multilib/lib32-sdl_ttf/PKGBUILD multilib/libtool-multilib/PKGBUILD multilib/nspluginwrapper/PKGBUILD multilib/q4wine/PKGBUILD multilib/wine/PKGBUILD staging/php/PKGBUILD staging/php/php-fpm.conf.in.patch staging/php/php.ini.patch
2012-01-19Thu Jan 19 23:15:03 UTC 2012root
2012-01-13Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolas Reynolds
Conflicts: community-testing/packagekit/PKGBUILD community/bird/PKGBUILD community/camlp5/PKGBUILD community/exim/PKGBUILD community/ibus-table-extraphrase/PKGBUILD community/mingw32-gcc-base/PKGBUILD community/mingw32-gcc/PKGBUILD community/torcs/PKGBUILD core/db/PKGBUILD core/iproute2/PKGBUILD core/libsasl/PKGBUILD core/openldap/PKGBUILD core/pam/PKGBUILD core/util-linux/PKGBUILD extra/cyrus-sasl/PKGBUILD extra/ffmpeg/PKGBUILD extra/kdelibs/PKGBUILD extra/libreoffice/PKGBUILD extra/php/PKGBUILD extra/postfix/PKGBUILD extra/python-lxml/PKGBUILD extra/rdesktop/PKGBUILD extra/redland/PKGBUILD extra/subversion/PKGBUILD extra/tidyhtml/PKGBUILD extra/transmission/PKGBUILD extra/windowmaker/PKGBUILD kde-unstable/calligra/PKGBUILD multilib/lib32-libdrm/PKGBUILD multilib/lib32-libdrm/no-pthread-stubs.patch multilib/lib32-openssl/PKGBUILD
2012-01-09Mon Jan 9 23:14:46 UTC 2012root
2011-12-23Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/google-gadgets/PKGBUILD community/kvirc/PKGBUILD community/qmc2/PKGBUILD extra/arora/PKGBUILD extra/dhcp/PKGBUILD extra/gtk-xfce-engine/PKGBUILD extra/libreoffice/PKGBUILD extra/monodevelop/PKGBUILD extra/php/PKGBUILD extra/pyqt/PKGBUILD extra/qt/PKGBUILD extra/qt3/PKGBUILD extra/unixodbc/PKGBUILD extra/xulrunner/PKGBUILD multilib/wine/PKGBUILD testing/nilfs-utils/PKGBUILD
2011-12-22Thu Dec 22 23:15:04 UTC 2011root
2011-12-05Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/virtualbox/PKGBUILD
2011-12-04Sun Dec 4 23:14:51 UTC 2011root
2011-11-21Mon Nov 21 23:14:49 UTC 2011root
2011-11-09Wed Nov 9 23:14:53 UTC 2011root
2011-11-03Thu Nov 3 23:14:47 UTC 2011root
2011-10-25Tue Oct 25 23:14:56 UTC 2011root
2011-10-04Tue Oct 4 23:14:30 UTC 2011root
2011-09-25Sun Sep 25 23:14:59 UTC 2011root
2011-09-21Wed Sep 21 23:14:42 UTC 2011root
2011-11-22Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolas Reynolds
Conflicts: community/mingw32-binutils/PKGBUILD community/numlockx/PKGBUILD community/slock/PKGBUILD extra/graphviz/PKGBUILD
2011-11-10Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolas Reynolds
Conflicts: community/virtualbox/PKGBUILD extra/irqbalance/PKGBUILD extra/lirc/PKGBUILD extra/ruby/PKGBUILD extra/xulrunner/PKGBUILD multilib/lib32-gtk2/PKGBUILD multilib/wine/PKGBUILD
2011-11-04Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolas Reynolds
Conflicts: community-staging/mlt/PKGBUILD community-testing/acetoneiso2/PKGBUILD community-testing/paraview/PKGBUILD community-testing/qbittorrent/PKGBUILD community-testing/virtualbox/PKGBUILD community-testing/virtualbox/virtualbox.install community/chmsee/PKGBUILD extra/kdelibs/PKGBUILD extra/kdeutils/PKGBUILD extra/libmpdclient/PKGBUILD extra/xf86-video-ati/PKGBUILD extra/xfce4-session/PKGBUILD extra/xfce4-smartbookmark-plugin/PKGBUILD kde-unstable/kdebase-workspace/PKGBUILD multilib/lib32-libdrm/PKGBUILD multilib/lib32-readline/PKGBUILD
2011-10-28Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolas Reynolds
Conflicts: community/esmtp/PKGBUILD community/geany-plugins/PKGBUILD community/giggle/PKGBUILD community/guichan/PKGBUILD community/mxml/PKGBUILD community/ruby-gtk2/PKGBUILD core/libtool/PKGBUILD core/mkinitcpio-busybox/PKGBUILD core/udev/PKGBUILD extra/audacious/PKGBUILD extra/conky/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gtk2/PKGBUILD extra/gtk3/PKGBUILD extra/gvfs/PKGBUILD extra/kdeutils/PKGBUILD extra/kino/PKGBUILD extra/mkvtoolnix/PKGBUILD extra/poppler/PKGBUILD extra/postfix/PKGBUILD extra/pulseaudio/PKGBUILD extra/qtcurve-gtk2/PKGBUILD extra/transmission/PKGBUILD extra/xfburn/PKGBUILD extra/xfce4-xkb-plugin/PKGBUILD extra/xorg-server/PKGBUILD extra/yelp/PKGBUILD kde-unstable/calligra/PKGBUILD multilib/lib32-gtk2/PKGBUILD multilib/lib32-libpulse/PKGBUILD multilib/libtool-multilib/PKGBUILD multilib/wine/PKGBUILD multilib/wine/wine.install
2011-10-07Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolas Reynolds
Conflicts: community/fotoxx/PKGBUILD community/gtkdialog/PKGBUILD community/hubbub/PKGBUILD community/libgdamm/PKGBUILD community/libparserutils/PKGBUILD community/mingw32-binutils/PKGBUILD community/mingw32-gcc-base/PKGBUILD community/mingw32-gcc/PKGBUILD community/mtpaint/PKGBUILD community/netsurf/PKGBUILD community/patchage/PKGBUILD community/qgo/PKGBUILD community/tomoyo-tools/PKGBUILD community/tre/PKGBUILD community/virtualbox/PKGBUILD core/net-tools/PKGBUILD core/openldap/PKGBUILD extra/epiphany/PKGBUILD extra/evince/PKGBUILD extra/evolution-data-server/PKGBUILD extra/evolution/PKGBUILD extra/exiv2/PKGBUILD extra/folks/PKGBUILD extra/gimp-ufraw/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gnome-power-manager/PKGBUILD extra/gnome-python-desktop/PKGBUILD extra/gnome-python-extras/PKGBUILD extra/gvfs/PKGBUILD extra/jack/PKGBUILD extra/kdelibs/PKGBUILD extra/kdepim/PKGBUILD extra/koffice/PKGBUILD extra/libreoffice/PKGBUILD extra/libwebkit/PKGBUILD extra/mutter/PKGBUILD extra/nautilus/PKGBUILD extra/openmpi/PKGBUILD extra/pavucontrol/PKGBUILD extra/php/PKGBUILD extra/pidgin/PKGBUILD extra/postgresql/PKGBUILD extra/pulseaudio/PKGBUILD extra/pygobject2/PKGBUILD extra/swt/PKGBUILD extra/tomcat/PKGBUILD extra/totem/PKGBUILD extra/vigra/PKGBUILD extra/vte/PKGBUILD extra/xulrunner/PKGBUILD kde-unstable/calligra/PKGBUILD kde-unstable/kdebase-workspace/PKGBUILD multilib/lib32-atk/PKGBUILD multilib/lib32-gdk-pixbuf2/PKGBUILD multilib/lib32-glew/PKGBUILD multilib/lib32-glib2/PKGBUILD multilib/lib32-jack/PKGBUILD multilib/lib32-libpulse/PKGBUILD multilib/lib32-pango/PKGBUILD multilib/wine/PKGBUILD social/miniupnpc/PKGBUILD testing/icedtea-web-java7/PKGBUILD testing/sqlite3/PKGBUILD ~xihh/abiword/PKGBUILD