diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-04 18:05:18 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-04 18:05:18 +0200 |
| commit | 28755f91b7986fbd36ec21705a5f941479b6d8f4 (patch) | |
| tree | 760750f64418a6907afcccd916de4a769ed2bc3f /extra/calligra/fix-docx-support.patch | |
| parent | 7298ba8d13324c20278060c1ff5f63467cef9684 (diff) | |
| parent | 0a24fb835cac4007388213ad0afb15257b035b14 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/lazarus/PKGBUILD
extra/msmtp/PKGBUILD
multilib/jack2-multilib/PKGBUILD
testing/glib2/PKGBUILD
testing/lvm2/PKGBUILD
testing/mdadm/PKGBUILD
testing/mdadm/mdadm
testing/mdadm/mdadm_hook
testing/mdadm/mdadm_udev_install
testing/systemd/PKGBUILD
testing/systemd/systemd.install
Diffstat (limited to 'extra/calligra/fix-docx-support.patch')
0 files changed, 0 insertions, 0 deletions