diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-21 10:43:42 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-21 10:43:42 +0200 |
| commit | 4e66a1c1c541a0b60aa63f4d846c5e6f225b71b8 (patch) | |
| tree | db8c1d395ab4a671230a246df665dbee6b62235d /libre/abiword-libre | |
| parent | 742bd5a396f7a4c474e8ffec0686fc7312603cb8 (diff) | |
| parent | 031887a2047546085998f965214f5b682664de9b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/emacs-nox/PKGBUILD
community/gmic/PKGBUILD
community/libgtksourceviewmm2/PKGBUILD
community/libnewt/PKGBUILD
community/nicotine/PKGBUILD
community/plan9port/PKGBUILD
extra/calligra/PKGBUILD
extra/ilmbase/PKGBUILD
extra/libwps/PKGBUILD
extra/openexr/PKGBUILD
extra/poppler/PKGBUILD
Diffstat (limited to 'libre/abiword-libre')
0 files changed, 0 insertions, 0 deletions