diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-28 10:54:32 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-28 10:54:32 -0300 |
| commit | 6aa1c22fe01ff4df6c5f75fd04d551b53f7df389 (patch) | |
| tree | 3aa1745b2e6a8a2ee8f6e8a44ca6330d9bc62065 /core/gpgme | |
| parent | d41442b9f2dccbf8c7a283391e2bc3fe8b29bf07 (diff) | |
| parent | a26ce336126d18cde915c2331250b8dfbffc24f8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vhba-module/PKGBUILD
community/cdemu-daemon/PKGBUILD
community/luakit/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gthumb/PKGBUILD
gnome-unstable/libgnomekbd/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libsm/PKGBUILD
multilib/lib32-libxcursor/PKGBUILD
multilib/lib32-libxmu/PKGBUILD
multilib/lib32-libxrender/PKGBUILD
multilib/lib32-libxt/PKGBUILD
multilib/lib32-libxv/PKGBUILD
multilib/lib32-libxvmc/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
Diffstat (limited to 'core/gpgme')
0 files changed, 0 insertions, 0 deletions