diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-16 21:10:42 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-16 21:10:42 -0300 |
| commit | 846ec2ab218d28aa24dee75503909f9337d67e46 (patch) | |
| tree | 012f9c67757ff9638b3b27cfb7a8c8c6c44a92cf /~fauno | |
| parent | f24ad15758f8eebcc46cb0c210f888491869d3f0 (diff) | |
| parent | 9a940818cc3edb82afac4d73a6474e6e3374f987 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
extra/kdepim/PKGBUILD
gnome-unstable/gnome-color-manager/PKGBUILD
gnome-unstable/seahorse/PKGBUILD
libre/pacman/PKGBUILD
testing/libreoffice/PKGBUILD
testing/util-linux/PKGBUILD
testing/xf86-input-synaptics/PKGBUILD
Diffstat (limited to '~fauno')
0 files changed, 0 insertions, 0 deletions