summaryrefslogtreecommitdiff
path: root/core/keyutils
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-09 20:52:21 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-09 20:52:21 -0300
commitaabab2c530c33c1beb40ac3dacb95e19ab99eac3 (patch)
tree1417c10b601a05725676a727a25901a32e7fd94c /core/keyutils
parent3357db80ffa8a795fb5cdad0fc726470887706b0 (diff)
parentd1e588afc2779754c0abd1122ecf4f8e3c863d7a (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: extra/cinepaint/PKGBUILD extra/cmake/PKGBUILD extra/fltk/PKGBUILD extra/foomatic/PKGBUILD extra/kdegraphics/PKGBUILD extra/kdelibs/PKGBUILD extra/kdepim-runtime/PKGBUILD extra/kdepim/PKGBUILD extra/libxi/PKGBUILD extra/monica/PKGBUILD extra/rasqal/PKGBUILD extra/soprano/PKGBUILD multilib/wine/PKGBUILD testing/mesa/PKGBUILD
Diffstat (limited to 'core/keyutils')
0 files changed, 0 insertions, 0 deletions