summaryrefslogtreecommitdiff
path: root/extra/kdeedu-kalzium
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-08-19 12:09:59 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-08-19 12:09:59 +0200
commitb17208557669f7d787c139c7f15913be60db7b1b (patch)
treeffff55729461c274bd3a8b144fddbfdad6795456 /extra/kdeedu-kalzium
parent911a818dc1dde41745d065b1272333f5668ed270 (diff)
parent26606f981048ee9efcda690b619d3c53501a7a58 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/goaccess/PKGBUILD core/glib2/PKGBUILD extra/antlr2/PKGBUILD
Diffstat (limited to 'extra/kdeedu-kalzium')
0 files changed, 0 insertions, 0 deletions