summaryrefslogtreecommitdiff
path: root/staging/kdeedu-ktouch
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-03-09 10:00:51 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-03-09 10:00:51 +0100
commit0d2db49bfa6eaddb1409e9cdaf4e688341e75382 (patch)
treebecabe4db4fbf3eeea0bcca6a522f31361562500 /staging/kdeedu-ktouch
parentc3917cf06ed660cf3a147f54c9511493dc454012 (diff)
parent92eac63df242654434dceb000bac083f6e81a6b9 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: extra/pavucontrol/PKGBUILD
Diffstat (limited to 'staging/kdeedu-ktouch')
0 files changed, 0 insertions, 0 deletions