diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-29 02:31:43 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-29 02:31:43 -0300 |
commit | e87b42b0f90e1a4d8b255f1dab945f2f3bb13cdc (patch) | |
tree | e36d5720f76b5db9dd5f97260108607023d7d2e7 /extra/kdeedu-kmplot | |
parent | c0e37a8f32f335c12352f23cdc73113099e057ec (diff) | |
parent | 32b05a621cb20af1bd4b7cd6f5609b7512bb20f1 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/avfs/PKGBUILD
extra/gtk2/PKGBUILD
extra/hercules/PKGBUILD
multilib/lib32-libcap/PKGBUILD
multilib/lib32-qt/PKGBUILD
Diffstat (limited to 'extra/kdeedu-kmplot')
0 files changed, 0 insertions, 0 deletions