diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-07 23:19:36 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-07 23:19:36 -0300 |
| commit | a73dd5c830228a85fc975c4c4434b796e9e7858b (patch) | |
| tree | a4b5b938456b2a4cc3045a8b8d4fd3117b9277db /extra/exempi | |
| parent | 3b4c5929151db9bc1ea2e2e4f4ad22fed88a1a34 (diff) | |
| parent | 37e364f033ed6db243d6db524075d8c5394c90f9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gnustep-make/PKGBUILD
extra/foomatic/PKGBUILD
extra/gnutls/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
staging/libreoffice/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'extra/exempi')
0 files changed, 0 insertions, 0 deletions