diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-22 19:48:00 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-22 19:48:00 -0300 |
| commit | 37c6b66933676a18529b4e647d1a79a626900512 (patch) | |
| tree | 71c20974a4371e5bb41d2fa4faa807a73f12f8b8 /extra/kdeedu-marble | |
| parent | a3574b9529a82018664ff6e810d7d81b2bb4eb75 (diff) | |
| parent | 0297e16d6d46f426939811847e72539d15bbf12d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/qt/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/use-split-usr-path.patch
Diffstat (limited to 'extra/kdeedu-marble')
0 files changed, 0 insertions, 0 deletions