summaryrefslogtreecommitdiff
path: root/extra/kdeedu-step
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-02 13:15:07 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-02 13:15:07 -0300
commit399a563eb2c30475d66ced8203aff23d65e540e8 (patch)
treefc3d829608b2434293be837200a8267ca789342e /extra/kdeedu-step
parent3aff11a8581ae7e5a8ccea02062cd92f873c44c5 (diff)
parent941550cbc215d608bd18439f99500b74fbb80f0d (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/yagf/PKGBUILD extra/antlr2/PKGBUILD gnome-unstable/baobab/PKGBUILD gnome-unstable/baobab/baobab.install testing/iputils/PKGBUILD testing/iputils/iputils.install
Diffstat (limited to 'extra/kdeedu-step')
0 files changed, 0 insertions, 0 deletions