diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-08 13:14:39 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-08 13:14:39 +0100 |
| commit | 31ccd8fa213350d61560c16caac29e5c0bb0f54f (patch) | |
| tree | ea0288a26a5d9c325da1502ed4450936c52b8272 /testing/calligra/calligra-plan.install | |
| parent | 3734b1ff855a5738195c6ff3def244d7b2e23e50 (diff) | |
| parent | b8c6ff8db00ce5eec5e6f20a90e8f8ec993ef3d5 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/codeblocks/PKGBUILD
community/siege/PKGBUILD
extra/opus/PKGBUILD
extra/rtmpdump/PKGBUILD
Diffstat (limited to 'testing/calligra/calligra-plan.install')
0 files changed, 0 insertions, 0 deletions