diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-21 01:12:38 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-21 01:12:38 -0300 |
| commit | 62130de96451044ea587d1cef2302c4cf3f910c4 (patch) | |
| tree | 7ab5036739c0b7c3aa0ac787287b38652f1bcffb /extra/libnice/PKGBUILD | |
| parent | 46d785933a49b1f2d742ca828f7b12c6a9a9d401 (diff) | |
| parent | 6d22541bcebb7236bedfb98a96d5a1292072e86c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vhba-module/60-vhba.rules
community-testing/vhba-module/PKGBUILD
community-testing/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/gzip/PKGBUILD
core/logrotate/PKGBUILD
extra/bluez/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdebindings-smokekde/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/libtool-multilib/PKGBUILD
Diffstat (limited to 'extra/libnice/PKGBUILD')
0 files changed, 0 insertions, 0 deletions