diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-26 18:59:42 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-26 18:59:42 -0300 |
| commit | 959510fa239cdcdaf0d8d3875cd2aaf652d74241 (patch) | |
| tree | 0afdc6c433cbf03de1656e5d2557838af7098214 /extra/folks | |
| parent | 37c6b66933676a18529b4e647d1a79a626900512 (diff) | |
| parent | 483f8b3ac46ac2d40e8cc2f9c25365741bebc791 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/happy/PKGBUILD
community-staging/haskell-quickcheck/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
core/mlocate/PKGBUILD
core/procps-ng/PKGBUILD
core/sysvinit/PKGBUILD
elementary/gtk-engine-equinox/PKGBUILD
extra/audacious/PKGBUILD
extra/libsigc++/PKGBUILD
extra/postgresql-old-upgrade/PKGBUILD
extra/qt/PKGBUILD
extra/tftp-hpa/PKGBUILD
extra/transmission/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/atk/PKGBUILD
gnome-unstable/clutter/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/gtkhtml4/PKGBUILD
gnome-unstable/gvfs/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/nautilus/PKGBUILD
gnome-unstable/vala/PKGBUILD
gnome-unstable/webkitgtk3/PKGBUILD
libre/libretools/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
testing/mlocate/PKGBUILD
testing/openmpi/PKGBUILD
testing/run-parts/PKGBUILD
testing/systemd/PKGBUILD
testing/transmission/PKGBUILD
testing/transmission/transmission-cli.install
testing/transmission/transmission.systemd
Diffstat (limited to 'extra/folks')
0 files changed, 0 insertions, 0 deletions