diff options
| author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-19 12:44:24 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-19 12:44:24 -0500 |
| commit | 071445e6a2bb31ddf638e6f2e5362953b47e72dc (patch) | |
| tree | 9ec266d72aaa5971dee2d1abbe2de511d971de87 /extra/xorg-x11perf | |
| parent | c14218d562c03601d6d23666f77ed0c2f0025c1b (diff) | |
| parent | b8ea4461e461f0e1782e28b5810eb811423afa79 (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el into pre
Conflicts:
core/heimdal/PKGBUILD
extra/apache-ant/PKGBUILD
extra/aria2/PKGBUILD
extra/bs/PKGBUILD
extra/dosbox/PKGBUILD
extra/ettercap-gtk/PKGBUILD
extra/gqmpeg/PKGBUILD
extra/gtk-theme-switch2/PKGBUILD
extra/icecast/PKGBUILD
extra/kmldonkey/PKGBUILD
extra/kmplayer/PKGBUILD
extra/libbtctl/PKGBUILD
extra/libx86/PKGBUILD
extra/mc/PKGBUILD
extra/monotone/PKGBUILD
extra/nbsmtp/PKGBUILD
extra/nickle/PKGBUILD
extra/nppangband/PKGBUILD
extra/numlockx/PKGBUILD
extra/python-gtkglext/PKGBUILD
extra/speedcrunch/PKGBUILD
extra/vbetool/PKGBUILD
libre/xchat-gnome-libre/PKGBUILD
libre/xchat-gnome-libre/gtk2-2.20.patch
libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
libre/xchat-gnome-libre/xchat-gnome.install
Diffstat (limited to 'extra/xorg-x11perf')
0 files changed, 0 insertions, 0 deletions