diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-08 09:02:16 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-08 09:02:16 -0300 |
| commit | dec82423b45179c362a4727cc3d63fb2349af369 (patch) | |
| tree | 552f0832ffe5dab6305382ea0c0e4a42da17063a /extra/xf86-video-sisimedia | |
| parent | a0f85906119bcb8e7269dee701076946b3ec45ea (diff) | |
| parent | ef815a5d80eecd4ba0679a376386741c374e0d1b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dzen2/PKGBUILD
community/qtcurve-kde4/PKGBUILD
core/openldap/PKGBUILD
extra/geeqie/PKGBUILD
extra/kactivities/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdebindings-korundum/PKGBUILD
extra/kdebindings-kross/PKGBUILD
extra/kdebindings-perlkde/PKGBUILD
extra/kdebindings-perlqt/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdebindings-qtruby/PKGBUILD
extra/kdebindings-qyoto/PKGBUILD
extra/kdebindings-smokegen/PKGBUILD
extra/kdebindings-smokekde/PKGBUILD
extra/kdebindings-smokeqt/PKGBUILD
extra/kdeedu-analitza/PKGBUILD
extra/kdegraphics-ksaneplugin/PKGBUILD
extra/kdegraphics-mobipocket/PKGBUILD
extra/kdegraphics-strigi-analyzer/PKGBUILD
extra/kdegraphics-svgpart/PKGBUILD
extra/kdegraphics-thumbnailers/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdepimlibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kdeutils-sweeper/PKGBUILD
extra/libkdcraw/PKGBUILD
extra/libkdeedu/PKGBUILD
extra/libkexiv2/PKGBUILD
extra/libkipi/PKGBUILD
extra/libksane/PKGBUILD
extra/moc/PKGBUILD
extra/strigi/PKGBUILD
extra/vice/PKGBUILD
Diffstat (limited to 'extra/xf86-video-sisimedia')
0 files changed, 0 insertions, 0 deletions