diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-22 12:02:54 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-22 12:02:54 -0300 |
| commit | aa49e201b1464851bcebcd821592a2fceeaddcbc (patch) | |
| tree | 40708e916d04d7929b2bc2a8c17c796fb91dec8e /community/haskell-mmap/PKGBUILD | |
| parent | e555324330bef021c747085c7499fd843ed20f47 (diff) | |
| parent | 39e662ccfbe62ae77d458159d192816171a22f43 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/agave/PKGBUILD
community/raul/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/atk/PKGBUILD
gnome-unstable/cheese/PKGBUILD
gnome-unstable/cogl/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/gdk-pixbuf2/PKGBUILD
gnome-unstable/gedit/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/gnome-bluetooth/PKGBUILD
gnome-unstable/gnome-documents/PKGBUILD
gnome-unstable/gnome-documents/gnome-documents.install
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gnome-system-monitor/PKGBUILD
gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/gtksourceview3/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/libwebkit/PKGBUILD
gnome-unstable/metacity/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/nautilus/PKGBUILD
gnome-unstable/sushi/PKGBUILD
gnome-unstable/telepathy-farstream/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
testing/iproute2/PKGBUILD
testing/openssh/PKGBUILD
Diffstat (limited to 'community/haskell-mmap/PKGBUILD')
0 files changed, 0 insertions, 0 deletions