diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-07 12:19:54 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-07 12:19:54 -0300 |
commit | 730bda0e79d3e122d665663a18e0c973d7209236 (patch) | |
tree | 251b00a85c7bbc2e3ee21102c5c16c1054cf4669 /~fauno/notmuch/PKGBUILD | |
parent | cfe7b034671297c6bba5e91867d98e182c683ded (diff) | |
parent | fe769389426a6aa5a2878bf7dcfc6144717e1e93 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gcolor2/PKGBUILD
community/perl-list-moreutils/PKGBUILD
extra/boost/PKGBUILD
extra/cdrkit/PKGBUILD
extra/ettercap/PKGBUILD
extra/lame/PKGBUILD
extra/sdl/PKGBUILD
extra/unzip/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/caribou/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gtkmm3/PKGBUILD
gnome-unstable/yelp/PKGBUILD
Diffstat (limited to '~fauno/notmuch/PKGBUILD')
0 files changed, 0 insertions, 0 deletions