summaryrefslogtreecommitdiff
path: root/extra/samba/PKGBUILD
AgeCommit message (Collapse)Author
2013-10-15Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/avant-window-navigator/PKGBUILD community/awn-extras-applets/PKGBUILD community/cinnamon-control-center/PKGBUILD community/gnome-menus2/PKGBUILD community/gnome-panel/PKGBUILD community/gpsim/PKGBUILD community/kgraphviewer/PKGBUILD community/kpovmodeler/PKGBUILD community/libdesktop-agnostic/PKGBUILD community/python-basemap/PKGBUILD community/python-mpi4py/PKGBUILD community/python-psutil/PKGBUILD community/qgo/PKGBUILD community/ude/PKGBUILD community/virtkey/PKGBUILD extra/alsaplayer/PKGBUILD extra/aterm/PKGBUILD extra/cups-pdf/PKGBUILD extra/ffmpeg/PKGBUILD extra/gtk2/PKGBUILD extra/kdeplasma-applets-networkmanagement/PKGBUILD extra/libffado/PKGBUILD extra/libtar/PKGBUILD extra/maxima/PKGBUILD extra/php-xcache/PKGBUILD extra/postgresql/PKGBUILD extra/xorg-server/PKGBUILD extra/xorg-xauth/PKGBUILD
2013-10-10Thu Oct 10 01:58:46 PDT 2013root
2013-08-22Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elMichał Masłowski
Conflicts: community/python-mpi4py/PKGBUILD community/python-psutil/PKGBUILD extra/kdepim/PKGBUILD extra/libgtop/PKGBUILD libre/bitlbee-libre/PKGBUILD
2013-08-22Thu Aug 22 02:58:39 PDT 2013root
2013-08-17Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elMichał Masłowski
Conflicts: community/bsdiff/PKGBUILD community/drivel/PKGBUILD community/dvdbackup/PKGBUILD community/gdlmm/PKGBUILD community/gnome-phone-manager/PKGBUILD community/highlight/PKGBUILD community/i3-wm/PKGBUILD community/linux-tools/PKGBUILD community/obconf/PKGBUILD community/perl-class-factory-util/PKGBUILD community/python-mpi4py/PKGBUILD community/qupzilla/PKGBUILD community/subtitleeditor/PKGBUILD community/synce-librapi/PKGBUILD community/synce-libsynce/PKGBUILD community/tilda/PKGBUILD core/glibc/PKGBUILD core/iputils/PKGBUILD extra/alsa-tools/PKGBUILD extra/calligra/PKGBUILD extra/imagemagick/PKGBUILD extra/kobodeluxe/PKGBUILD extra/libburn/PKGBUILD extra/libisoburn/PKGBUILD extra/libisofs/PKGBUILD extra/libsamplerate/PKGBUILD extra/mariadb/PKGBUILD extra/maxima/PKGBUILD extra/nasm/PKGBUILD extra/perl-netaddr-ip/PKGBUILD extra/perl-template-toolkit/PKGBUILD extra/putty/PKGBUILD extra/samba/PKGBUILD extra/tk/PKGBUILD extra/vim/PKGBUILD extra/xorg-xprop/PKGBUILD extra/xorg-xwd/PKGBUILD pcr/ams/PKGBUILD pcr/clalsadrv/PKGBUILD
2013-08-07Wed Aug 7 02:56:35 PDT 2013root
2013-07-09Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/aspell-pl/PKGBUILD community/gloox/PKGBUILD community/libircclient/PKGBUILD community/mashup/PKGBUILD community/omniorb/PKGBUILD community/openbox/PKGBUILD community/patchutils/PKGBUILD community/rxvt-unicode/PKGBUILD extra/mesa/PKGBUILD extra/pygobject2/PKGBUILD extra/qt5/PKGBUILD extra/samba/PKGBUILD extra/tdb/PKGBUILD extra/transmission/PKGBUILD extra/vim/PKGBUILD pcr/python-sfml2/PKGBUILD pcr/python2-sfml2/PKGBUILD
2013-07-05Fri Jul 5 01:40:49 PDT 2013root
2013-05-30Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/apcupsd/PKGBUILD community/bmp-musepack/PKGBUILD community/bmp-wma/PKGBUILD community/bonnie++/PKGBUILD community/cantata/PKGBUILD community/checkinstall/PKGBUILD community/chrootuid/PKGBUILD community/compiz-bcop/PKGBUILD community/compiz-fusion-plugins-extra/PKGBUILD community/compiz-fusion-plugins-main/PKGBUILD community/compiz/PKGBUILD community/compizconfig-backend-gconf/PKGBUILD community/compizconfig-python/PKGBUILD community/ekg2/PKGBUILD community/emerald/PKGBUILD community/fbgetty/PKGBUILD community/flumotion/PKGBUILD community/leafnode/PKGBUILD community/libcompizconfig/PKGBUILD community/libdnet/PKGBUILD community/libee/PKGBUILD community/libtxc_dxtn/PKGBUILD community/linux-tools/PKGBUILD community/openntpd/PKGBUILD community/osiris/PKGBUILD community/perl-package-stash-xs/PKGBUILD community/perl-params-util/PKGBUILD community/procstatd/PKGBUILD community/scponly/PKGBUILD community/sniffit/PKGBUILD community/synergy/PKGBUILD community/turbojpeg/PKGBUILD community/unbound/PKGBUILD community/uucp/PKGBUILD core/gawk/PKGBUILD core/ifenslave/PKGBUILD core/jfsutils/PKGBUILD core/openldap/PKGBUILD core/rfkill/PKGBUILD core/systemd/PKGBUILD core/wireless_tools/PKGBUILD core/xinetd/PKGBUILD extra/avahi/PKGBUILD extra/calligra/PKGBUILD extra/clutter-gst/PKGBUILD extra/flac/PKGBUILD extra/hddtemp/PKGBUILD extra/libbluray/PKGBUILD extra/libdmx/PKGBUILD extra/libfs/PKGBUILD extra/libjpeg-turbo/PKGBUILD extra/libtiff/PKGBUILD extra/libxau/PKGBUILD extra/libxfixes/PKGBUILD extra/licq/PKGBUILD extra/mariadb/PKGBUILD extra/mesa/PKGBUILD extra/perl-guard/PKGBUILD extra/perl-template-toolkit/PKGBUILD extra/pidgin/PKGBUILD extra/pigeonhole/PKGBUILD extra/poppler/PKGBUILD extra/postgresql/PKGBUILD extra/python-geoip/PKGBUILD extra/python/PKGBUILD extra/samba/PKGBUILD extra/sqlite/PKGBUILD extra/vde2/PKGBUILD extra/vim/PKGBUILD extra/vlc/PKGBUILD extra/wireshark/PKGBUILD extra/xfce4-dict/PKGBUILD libre/libquicktime-libre/PKGBUILD libre/xscreensaver-libre/PKGBUILD
2013-05-25Sat May 25 00:28:12 PDT 2013root
2013-05-22Wed May 22 00:46:35 PDT 2013root
2013-05-16Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/bird/PKGBUILD community/drbd/PKGBUILD community/etherape/PKGBUILD community/ext4magic/PKGBUILD community/fcron/PKGBUILD community/fcron/systab.orig community/gnome-panel/PKGBUILD community/libident/PKGBUILD community/libtorrent/PKGBUILD community/linux-tools/PKGBUILD community/linux-tools/usbipd.service community/makedev/PKGBUILD community/minbif/PKGBUILD community/noip/PKGBUILD community/notmuch/PKGBUILD community/pam_pwcheck/PKGBUILD community/pound/PKGBUILD community/preload/PKGBUILD community/python-cchardet/PKGBUILD community/rtorrent/PKGBUILD community/tor/PKGBUILD community/ude/PKGBUILD core/openldap/PKGBUILD core/sysvinit/PKGBUILD extra/cd-discid/PKGBUILD extra/cvs/PKGBUILD extra/epiphany-extensions/PKGBUILD extra/fbset/PKGBUILD extra/fluidsynth/PKGBUILD extra/gtkmm/PKGBUILD extra/gvfs/PKGBUILD extra/kdepim/PKGBUILD extra/libical/PKGBUILD extra/mutt/PKGBUILD extra/netkit-bsd-finger/PKGBUILD extra/ossp/PKGBUILD extra/php/PKGBUILD extra/pidgin/PKGBUILD extra/rtkit/PKGBUILD extra/samba/PKGBUILD extra/totem/PKGBUILD extra/webkitgtk/PKGBUILD libre/liferea-libre/PKGBUILD libre/mplayer-vaapi-libre/PKGBUILD
2013-05-16Thu May 16 01:06:25 PDT 2013root
2013-05-09Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/bwbar/PKGBUILD community/dosbox/PKGBUILD community/extremetuxracer/PKGBUILD community/fbgrab/PKGBUILD community/fbv/PKGBUILD community/flam3/PKGBUILD community/freedroidrpg/PKGBUILD community/gdk-pixbuf/PKGBUILD community/ghemical/PKGBUILD community/gmic/PKGBUILD community/gnash/PKGBUILD community/gnustep-base/PKGBUILD community/guvcview/PKGBUILD community/keepassx/PKGBUILD community/kvpnc/PKGBUILD community/libghemical/PKGBUILD community/liboglappth/PKGBUILD community/png2ico/PKGBUILD community/shapelib/PKGBUILD community/sloccount/PKGBUILD community/tmw/PKGBUILD community/xmoto/PKGBUILD core/links/PKGBUILD extra/amule/PKGBUILD extra/cairomm/PKGBUILD extra/calligra/PKGBUILD extra/evas/PKGBUILD extra/fltk/PKGBUILD extra/gd/PKGBUILD extra/gif2png/PKGBUILD extra/glhack/PKGBUILD extra/graphviz/PKGBUILD extra/gstreamer0.10-good/PKGBUILD extra/imlib/PKGBUILD extra/imlib2/PKGBUILD extra/lbreakout2/PKGBUILD extra/libgdiplus/PKGBUILD extra/libkate/PKGBUILD extra/libpano13/PKGBUILD extra/libwebp/PKGBUILD extra/libwmf/PKGBUILD extra/libxslt/PKGBUILD extra/mjpegtools/PKGBUILD extra/ntp/PKGBUILD extra/nx/PKGBUILD extra/openjpeg/PKGBUILD extra/php/PKGBUILD extra/plotutils/PKGBUILD extra/poppler/PKGBUILD extra/qrencode/PKGBUILD extra/qt4/PKGBUILD extra/qt5/PKGBUILD extra/qtiplot/PKGBUILD extra/qtwebkit/PKGBUILD extra/samba/PKGBUILD extra/sdl_image/PKGBUILD extra/vice/PKGBUILD extra/vigra/PKGBUILD extra/vlc/PKGBUILD extra/webkitgtk/PKGBUILD extra/webkitgtk2/PKGBUILD extra/wv/PKGBUILD extra/wxgtk/PKGBUILD extra/xaos/PKGBUILD extra/xsane/PKGBUILD extra/zvbi/PKGBUILD
2013-05-07Tue May 7 00:36:35 PDT 2013root
2013-04-13Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/fcitx-mozc/PKGBUILD core/libcap/PKGBUILD extra/ncmpc/PKGBUILD extra/php/PKGBUILD extra/sqlite/PKGBUILD libre/hplip-libre/PKGBUILD libre/icecat/PKGBUILD
2013-04-13Sat Apr 13 00:05:58 PDT 2013root
2013-03-19Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/bitcoin/PKGBUILD community/chmsee/PKGBUILD community/projectm/PKGBUILD extra/apache/PKGBUILD extra/gv/PKGBUILD extra/libdc1394/PKGBUILD extra/libraw1394/PKGBUILD extra/samba/PKGBUILD extra/sg3_utils/PKGBUILD extra/upower/PKGBUILD extra/xf86-input-aiptek/PKGBUILD extra/xf86-video-modesetting/PKGBUILD extra/xorg-server/PKGBUILD libre/rp-pppoe-libre/PKGBUILD
2013-03-19Tue Mar 19 00:04:27 PDT 2013root
2013-03-02Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/bitcoin/PKGBUILD community/canorus/PKGBUILD community/celt-0.7/PKGBUILD community/djview4/PKGBUILD community/erlang-sdl/PKGBUILD community/erlang/PKGBUILD community/fcitx-mozc/PKGBUILD community/glitz/PKGBUILD community/gmerlin/PKGBUILD community/gmic/PKGBUILD community/goldendict/PKGBUILD community/google-gadgets/PKGBUILD community/highlight/PKGBUILD community/jack2/PKGBUILD community/kvirc/PKGBUILD community/launchy/PKGBUILD community/mplayer2/PKGBUILD community/mumble/PKGBUILD community/mupdf/PKGBUILD community/projectm/PKGBUILD community/psimedia/PKGBUILD community/pyqt3/PKGBUILD community/qps/PKGBUILD community/qstardict/PKGBUILD community/qsynergy/PKGBUILD community/synergy/PKGBUILD community/units/PKGBUILD community/yagf/PKGBUILD extra/automoc4/PKGBUILD extra/avahi/PKGBUILD extra/avidemux/PKGBUILD extra/bzflag/PKGBUILD extra/cagibi/PKGBUILD extra/cairo/PKGBUILD extra/calligra/PKGBUILD extra/cmake/PKGBUILD extra/dssi/PKGBUILD extra/ffmpeg/PKGBUILD extra/glu/PKGBUILD extra/graphviz/PKGBUILD extra/hylafax/PKGBUILD extra/kdesdk/PKGBUILD extra/libbluedevil/PKGBUILD extra/liblastfm/PKGBUILD extra/liborigin2/PKGBUILD extra/libpng/PKGBUILD extra/libqzeitgeist/PKGBUILD extra/libx11/PKGBUILD extra/mesa/PKGBUILD extra/mpg123/PKGBUILD extra/mtr/PKGBUILD extra/mysql/PKGBUILD extra/netpbm/PKGBUILD extra/nspr/PKGBUILD extra/polkit-qt/PKGBUILD extra/poppler/PKGBUILD extra/prison/PKGBUILD extra/pyqt/PKGBUILD extra/qimageblitz/PKGBUILD extra/qscintilla/PKGBUILD extra/qsynth/PKGBUILD extra/qt-assistant-compat/PKGBUILD extra/qt-gstreamer/PKGBUILD extra/qt/PKGBUILD extra/qtwebkit/PKGBUILD extra/qwt/PKGBUILD extra/samba/PKGBUILD extra/sane/PKGBUILD extra/smplayer/PKGBUILD extra/soprano/PKGBUILD extra/texmacs/PKGBUILD extra/tomcat-native/PKGBUILD extra/transmission/PKGBUILD extra/wpa_supplicant_gui/PKGBUILD libre/lame-libre/PKGBUILD libre/linux-libre/PKGBUILD libre/mesa-demos-libre/PKGBUILD
2013-02-26Tue Feb 26 00:04:24 PST 2013root
2013-02-01Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/chicken/PKGBUILD extra/k3b/PKGBUILD extra/samba/PKGBUILD
2013-02-01Fri Feb 1 00:06:30 PST 2013root
2013-01-31Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/libpar2/PKGBUILD extra/audacity/PKGBUILD extra/samba/PKGBUILD extra/xorg-xev/PKGBUILD
2013-01-31Thu Jan 31 00:07:23 PST 2013root
2013-01-29Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/bitcoin/PKGBUILD community/fcron/PKGBUILD community/glob2/PKGBUILD community/gnash/PKGBUILD core/file/PKGBUILD core/findutils/PKGBUILD core/texinfo/PKGBUILD core/which/PKGBUILD extra/boost/PKGBUILD extra/libpst/PKGBUILD extra/mkvtoolnix/PKGBUILD extra/samba/PKGBUILD libre/linux-libre/PKGBUILD
2013-01-29Tue Jan 29 00:06:25 PST 2013root
2013-01-28Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/fcitx-chewing/PKGBUILD community/fcitx-cloudpinyin/PKGBUILD community/fcitx-rime/PKGBUILD community/linux-tools/PKGBUILD community/lxpanel/PKGBUILD community/pdns/PKGBUILD core/bash/PKGBUILD core/gcc/PKGBUILD core/glibc/PKGBUILD extra/json-c/PKGBUILD extra/liblouis/PKGBUILD extra/live-media/PKGBUILD extra/samba/PKGBUILD extra/transmission/PKGBUILD social/opentracker/PKGBUILD
2013-01-28Mon Jan 28 00:05:59 PST 2013root
2012-12-20Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/instead/PKGBUILD community/luasql/PKGBUILD community/qtcreator/PKGBUILD extra/dosfstools/PKGBUILD
2012-12-20Thu Dec 20 02:59:11 PST 2012root
2012-10-31Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/percona-server/PKGBUILD community/xmlrpc-c/PKGBUILD core/util-linux/PKGBUILD extra/colord/PKGBUILD extra/epiphany/PKGBUILD extra/evolution-data-server/PKGBUILD extra/evolution/PKGBUILD extra/gcr/PKGBUILD extra/gdm/PKGBUILD extra/gnome-color-manager/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gnome-dictionary/PKGBUILD extra/gnome-font-viewer/PKGBUILD extra/gnome-screenshot/PKGBUILD extra/gnome-search-tool/PKGBUILD extra/gnome-system-log/PKGBUILD extra/gobject-introspection/PKGBUILD extra/grilo/PKGBUILD extra/gtkmm3/PKGBUILD extra/gvfs/PKGBUILD extra/json-glib/PKGBUILD extra/libgnome-keyring/PKGBUILD extra/nautilus-open-terminal/PKGBUILD extra/pidgin/PKGBUILD extra/pygobject/PKGBUILD extra/rest/PKGBUILD extra/rhythmbox/PKGBUILD extra/seahorse/PKGBUILD extra/totem/PKGBUILD extra/xorg-xinit/PKGBUILD extra/yelp/PKGBUILD
2012-10-31Wed Oct 31 01:34:59 PDT 2012root
2012-09-20Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/balsa/PKGBUILD community/bitcoin/PKGBUILD community/jack2/PKGBUILD community/kadu/PKGBUILD community/oss/PKGBUILD core/sudo/PKGBUILD extra/djvulibre/PKGBUILD extra/gtk2/PKGBUILD extra/kdenetwork/PKGBUILD extra/samba/PKGBUILD gnome-unstable/at-spi2-atk/PKGBUILD gnome-unstable/at-spi2-core/PKGBUILD gnome-unstable/glib-networking/PKGBUILD gnome-unstable/glib2/PKGBUILD gnome-unstable/gobject-introspection/PKGBUILD libre/kdenetwork-kopete-libre/PKGBUILD multilib/jack2-multilib/PKGBUILD multilib/lib32-gtk2/PKGBUILD multilib/lib32-sdl/PKGBUILD multilib/wine/PKGBUILD multilib/zsnes/PKGBUILD testing/btrfs-progs/PKGBUILD testing/dnsutils/PKGBUILD testing/man-db/PKGBUILD testing/postgresql/PKGBUILD testing/postgresql/postgresql.install testing/postgresql/postgresql.service testing/procps-ng/PKGBUILD testing/procps-ng/sysctl.conf testing/sudo/PKGBUILD testing/xf86-video-nouveau/PKGBUILD testing/xf86-video-nouveau/xf86-video-nouveau.install
2012-09-20Thu Sep 20 01:37:13 PDT 2012root
2012-08-30Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/avifile/PKGBUILD community/drbd/PKGBUILD extra/feh/PKGBUILD extra/samba/PKGBUILD libre/syslinux/PKGBUILD social/batctl/PKGBUILD
2012-08-30Thu Aug 30 00:04:42 UTC 2012root
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-09Thu Aug 9 00:02:24 UTC 2012root
2012-06-28Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: core/systemd/PKGBUILD extra/dbus-glib/PKGBUILD extra/samba/PKGBUILD kde-unstable/kdebase-workspace/PKGBUILD kde-unstable/kdegraphics-mobipocket/PKGBUILD multilib/lib32-dbus-core/PKGBUILD multilib/lib32-libtiff/PKGBUILD
2012-06-28Thu Jun 28 00:01:48 UTC 2012root
2012-06-11Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/hostapd/PKGBUILD extra/samba/PKGBUILD staging/ffmpeg/PKGBUILD
2012-06-11Mon Jun 11 00:02:18 UTC 2012root
2012-06-10Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: extra/kdemultimedia/PKGBUILD extra/kdenetwork/PKGBUILD extra/samba/PKGBUILD multilib/lib32-gnutls/PKGBUILD multilib/wine/PKGBUILD staging/kdemultimedia/PKGBUILD
2012-06-10Sun Jun 10 00:04:00 UTC 2012root
2012-05-06Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community/rtorrent/PKGBUILD core/libcap/PKGBUILD extra/samba/PKGBUILD extra/systemd/PKGBUILD extra/usbmuxd/PKGBUILD testing/glib2/PKGBUILD
2012-05-06Sun May 6 00:02:43 UTC 2012root
2012-04-28Merge branch 'master' of ↵Michał Masłowski
ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el Conflicts: community-testing/gnustep-base/PKGBUILD community-testing/gtranslator/PKGBUILD community-testing/parrot/PKGBUILD community/chmsee/PKGBUILD core/lvm2/PKGBUILD extra/php/PKGBUILD extra/samba/PKGBUILD multilib/lib32-openssl/PKGBUILD staging/php/PKGBUILD staging/php/php-fpm.conf.in.patch staging/php/php.ini.patch testing/cairo/PKGBUILD testing/eog-plugins/PKGBUILD testing/eog/PKGBUILD testing/gedit/PKGBUILD testing/gjs/PKGBUILD testing/glib2/PKGBUILD testing/gnome-documents/PKGBUILD testing/gnome-shell/PKGBUILD testing/gobject-introspection/PKGBUILD testing/libpeas/PKGBUILD testing/mutter/PKGBUILD testing/openssl/PKGBUILD testing/pygobject/PKGBUILD testing/python/PKGBUILD testing/rhythmbox/PKGBUILD testing/ruby/PKGBUILD testing/ruby/ruby.install testing/sushi/PKGBUILD testing/totem/PKGBUILD
2012-04-28Sat Apr 28 00:01:35 UTC 2012root
2012-04-13Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64elNicolás Reynolds
Conflicts: community/smalltalk/PKGBUILD extra/crypto++/PKGBUILD extra/libpciaccess/PKGBUILD extra/postfix/PKGBUILD extra/samba/PKGBUILD extra/xorg-server/PKGBUILD libre/gstreamer0.10-bad-libre/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-libpciaccess/PKGBUILD