diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-19 11:33:39 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-19 11:33:39 -0300 |
commit | 35d3377392b5d0678453096f87df70faf87f72c6 (patch) | |
tree | 5201142d5b6552bc17453d5ff4c1b27e3103bd2c /extra/sg3_utils | |
parent | 941cea43b3f1e6ba2220be5789c06c39cc89c62b (diff) | |
parent | e96f6ac6e912185a495a99af2b0d51b73bd1d044 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/aircrack-ng/PKGBUILD
community/fceux/PKGBUILD
extra/gtk2/PKGBUILD
extra/mesa/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/sg3_utils')
0 files changed, 0 insertions, 0 deletions