diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-26 01:16:44 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-26 01:16:44 -0300 |
| commit | 92155342158c2dbcc0c840325d63d1742d3583ec (patch) | |
| tree | f0900a2867d221c79742e7a06ca4244a21abf8f3 /extra/kdeedu-parley | |
| parent | 78fa3fcb824603de4b7bc558a423edca6bc18836 (diff) | |
| parent | e4a5730eb358cb0d78bc022204ddccac068c2bf2 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/astyle/PKGBUILD
community/gavl/PKGBUILD
community/lmms/PKGBUILD
community/portaudio/PKGBUILD
community/redshift/PKGBUILD
extra/gnutls/PKGBUILD
extra/libglade/PKGBUILD
extra/libgnome/PKGBUILD
extra/orbit2/PKGBUILD
extra/pypgsql/PKGBUILD
extra/vlc/PKGBUILD
extra/xorg-appres/PKGBUILD
extra/xorg-xdriinfo/PKGBUILD
extra/xorg-xfs/PKGBUILD
extra/xorg-xgamma/PKGBUILD
extra/xorg-xhost/PKGBUILD
extra/xorg-xkbevd/PKGBUILD
extra/xorg-xkbutils/PKGBUILD
extra/xorg-xload/PKGBUILD
extra/xorg-xlogo/PKGBUILD
extra/xorg-xlsatoms/PKGBUILD
extra/xorg-xlsclients/PKGBUILD
extra/xorg-xmag/PKGBUILD
extra/xorg-xmodmap/PKGBUILD
extra/xorg-xrdb/PKGBUILD
extra/xorg-xrefresh/PKGBUILD
extra/xorg-xsetroot/PKGBUILD
extra/xorg-xvidtune/PKGBUILD
extra/xorg-xwd/PKGBUILD
extra/xorg-xwud/PKGBUILD
extra/zile/PKGBUILD
multilib/wine/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/kdeedu-parley')
0 files changed, 0 insertions, 0 deletions