diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-10 18:23:51 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-10 18:23:51 -0300 |
| commit | 38b5b952ddc3b86560fc02e98105bf5826d25354 (patch) | |
| tree | 0e689740cb7cc4cf171a6c962e623dbe7e53fc64 /extra/grip | |
| parent | 1146fc0894bfda25180d63716029aabfa7ce017a (diff) | |
| parent | 0615a909b089a81d068ae10517ceff31dabfece1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/performous/PKGBUILD
community-testing/oss/PKGBUILD
community-testing/picard/PKGBUILD
community/deadbeef/PKGBUILD
community/gnash/PKGBUILD
community/mplayer2/PKGBUILD
community/radvd/PKGBUILD
community/tinc/PKGBUILD
core/glibc/PKGBUILD
core/lvm2/PKGBUILD
core/util-linux/PKGBUILD
extra/avidemux/PKGBUILD
extra/boost/PKGBUILD
extra/cppunit/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/kradio/PKGBUILD
extra/opal/PKGBUILD
extra/pidgin/PKGBUILD
extra/postfix/PKGBUILD
extra/ptlib/PKGBUILD
extra/xine-lib/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase-workspace/kdm.service
kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
libre/virtualbox-libre/PKGBUILD
libre/virtualbox-modules-lts/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libidn/PKGBUILD
multilib/lib32-libjpeg-turbo/PKGBUILD
multilib/lib32-pixman/PKGBUILD
staging/ekiga/PKGBUILD
staging/kdeedu-kig/PKGBUILD
staging/kdeedu-rocs/PKGBUILD
testing/glibc/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase-workspace/kdm.service
testing/nilfs-utils/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/grip')
0 files changed, 0 insertions, 0 deletions