summaryrefslogtreecommitdiff
path: root/extra/gnumeric
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-10-25 18:46:01 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-10-25 18:46:01 +0200
commit5833e11252fe4cc8a98860d8058eb9a5e468ee70 (patch)
tree2a9f6051350e5ded403cf65e81324e10f041827a /extra/gnumeric
parentaa59a87bb8860445bb3a4b233b44812b65b8c363 (diff)
parenta3b55a0c47a00ac40bc00a4ce87d93f809273840 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/cegui/PKGBUILD community-testing/darktable/PKGBUILD community-testing/freewrl/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/gource/PKGBUILD community-testing/luminancehdr/PKGBUILD community-testing/luxrays/PKGBUILD community-testing/luxrender/PKGBUILD community-testing/megaglest/PKGBUILD community-testing/openimageio/PKGBUILD community-testing/performous/PKGBUILD community-testing/projectm/PKGBUILD community-testing/rss-glx/PKGBUILD community-testing/sfml/PKGBUILD community-testing/spring/PKGBUILD community-testing/supertux/PKGBUILD community-testing/widelands/PKGBUILD community-testing/xbmc/PKGBUILD community-testing/xbmc/xbmc.install community/plan9port/PKGBUILD community/v8/PKGBUILD multilib/dev86/PKGBUILD testing/binutils/PKGBUILD testing/bzflag/PKGBUILD testing/calligra/PKGBUILD testing/cinepaint/PKGBUILD testing/coreutils/PKGBUILD testing/enblend-enfuse/PKGBUILD testing/gcc/PKGBUILD testing/gegl/PKGBUILD testing/glew/PKGBUILD testing/glibc/PKGBUILD testing/glibc/glibc.install testing/glibc/nscd.service testing/gnome-documents/PKGBUILD testing/hugin/PKGBUILD testing/inkscape/PKGBUILD testing/opencv/PKGBUILD testing/systemd/PKGBUILD testing/systemd/systemd.install testing/tracker/PKGBUILD testing/transcode/PKGBUILD testing/transcode/ffmpeg-0.11.patch testing/xf86-video-nouveau/PKGBUILD testing/xine-lib/PKGBUILD
Diffstat (limited to 'extra/gnumeric')
0 files changed, 0 insertions, 0 deletions