summaryrefslogtreecommitdiff
path: root/extra/lyx
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-11-08 09:54:57 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-11-08 09:54:57 +0100
commitca63f47c4736ce7a6f6b544c50cf29d2ffe563c1 (patch)
treee3ef58d850012b4943c980af55864f0fb768bcbc /extra/lyx
parentb28838efa921982fb5ab1ec277a2df13a9890983 (diff)
parenta8fff09ba6d0f8b78b43e63541b1254763d4f48e (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/apvlv/PKGBUILD community/haddock/PKGBUILD community/ibus-pinyin/PKGBUILD core/libtirpc/PKGBUILD extra/htop/PKGBUILD extra/rhythmbox/PKGBUILD
Diffstat (limited to 'extra/lyx')
0 files changed, 0 insertions, 0 deletions