diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-19 13:24:55 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-19 13:24:55 +0100 |
| commit | 48e718656f83ad8800caf503031b4efa0e49e38a (patch) | |
| tree | 2e415caf08da7fcf1724f2992cd47c99a7778bd6 /testing/calligra/PKGBUILD | |
| parent | 332060e036d38d6213201ed79b5d263241ca1825 (diff) | |
| parent | 19f11e0c4bbeefd65f85546a361e18532b60416a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gtypist/PKGBUILD
community/jack2/PKGBUILD
community/linux-tools/PKGBUILD
community/udevil/PKGBUILD
extra/ntp/PKGBUILD
extra/pulseaudio/PKGBUILD
Diffstat (limited to 'testing/calligra/PKGBUILD')
0 files changed, 0 insertions, 0 deletions