diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-15 10:55:52 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-15 10:55:52 +0100 |
| commit | 1f8bbc40bc42f162b7b62e0dca5176ba3d0b39a4 (patch) | |
| tree | b19a7be5f8a23cdf854c9694f968a531244204d2 /extra/xf86-video-mach64 | |
| parent | 2e3ca4b49391dc8484dd6064828ee42cbe66ed03 (diff) | |
| parent | eebfa6ebe1522831767019e496b0c094b2e15a5c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/audex/PKGBUILD
community/gimp-ufraw/PKGBUILD
community/ogmrip/PKGBUILD
community/oss/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/soundkonverter/PKGBUILD
core/iptables/PKGBUILD
core/libffi/PKGBUILD
extra/clamav/PKGBUILD
extra/ecasound/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
Diffstat (limited to 'extra/xf86-video-mach64')
0 files changed, 0 insertions, 0 deletions