diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-09 18:15:39 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-09 18:15:39 -0300 |
| commit | f35184e8782d5fe7fc3ea3f11042b29913cde6d8 (patch) | |
| tree | c984d07cfb1cb491f5e7a71f3771a81001398d74 /elementary | |
| parent | 520f5964346341a33a8337c8fd5b1afa10de6d5b (diff) | |
| parent | 54b7119c36756b86ea463649ee972cd6c1ce5863 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/nload/PKGBUILD
core/glibc/PKGBUILD
extra/aalib/PKGBUILD
extra/apache/PKGBUILD
extra/jasper/PKGBUILD
extra/libasyncns/PKGBUILD
extra/libvorbis/PKGBUILD
extra/libxslt/PKGBUILD
extra/xfce4-timer-plugin/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
staging/xorg-xinput/PKGBUILD
Diffstat (limited to 'elementary')
0 files changed, 0 insertions, 0 deletions