diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-08 11:22:51 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-08 11:22:51 -0300 |
| commit | 8b0286a4728c5a9d69b5bb2c9ee627be0ed70bdb (patch) | |
| tree | 7bce6b1f38e6c2cd2de7a5d2580a0b5ff4faf49b /staging/kdeedu-kanagram | |
| parent | a607668699d0ed030ac69ed31969dfa266439e38 (diff) | |
| parent | effb26c3b1f00bf8bea4e2562f07f9a06eb67606 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/shotwell/PKGBUILD
community-testing/texmaker/PKGBUILD
community/i3lock/PKGBUILD
core/dnsutils/PKGBUILD
core/expat/PKGBUILD
core/iptables/PKGBUILD
extra/ntp/PKGBUILD
extra/talloc/PKGBUILD
multilib/lib32-talloc/PKGBUILD
multilib/lib32-udev/PKGBUILD
Diffstat (limited to 'staging/kdeedu-kanagram')
0 files changed, 0 insertions, 0 deletions