summaryrefslogtreecommitdiff
path: root/extra/lyx/lyx.install
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-09-26 13:21:55 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-09-26 13:21:55 -0300
commit60e119a0f3297314f4bcd2b2b821eccd28992cd6 (patch)
tree83078f34ba0e5220164fe3f3b5cdff27ce87aaf9 /extra/lyx/lyx.install
parent8aa6cf7dacd74c155e7b2dd7af68a5cb4460e5b3 (diff)
parent21efc9511d14394cc1d8426e2e0a6c668964fbe9 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/lightspark/PKGBUILD community/camlp5/PKGBUILD community/gnote/PKGBUILD community/gtk-gnutella/PKGBUILD extra/ffmpeg/PKGBUILD extra/koffice/PKGBUILD extra/pyopenssl/PKGBUILD extra/virtuoso/PKGBUILD gnome-unstable/empathy/PKGBUILD gnome-unstable/epiphany/PKGBUILD gnome-unstable/folks/PKGBUILD gnome-unstable/gdm/PKGBUILD gnome-unstable/gjs/PKGBUILD gnome-unstable/gnome-games/PKGBUILD gnome-unstable/gnome-session/PKGBUILD gnome-unstable/gnome-shell/PKGBUILD gnome-unstable/gobject-introspection/PKGBUILD gnome-unstable/gthumb/PKGBUILD gnome-unstable/libgnomekbd/PKGBUILD gnome-unstable/libpeas/PKGBUILD gnome-unstable/mutter/PKGBUILD gnome-unstable/totem/PKGBUILD multilib/lib32-libffi/PKGBUILD multilib/wine/PKGBUILD testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/lyx/lyx.install')
0 files changed, 0 insertions, 0 deletions