diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-22 00:06:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-22 00:06:19 -0300 |
| commit | 45a1b262edf175ecf5dd43e51c8ee72f9d78265b (patch) | |
| tree | c96780037991d6d44cefc8a149e9b88c6bfc6d67 /community/flashrom | |
| parent | c034be9e8f973eb6c1dbb77fb4528fad379ddbfd (diff) | |
| parent | 69e1fada8bdc9588d0a3d8bc3403fa809d809a84 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/quvi/PKGBUILD
community/tasks/PKGBUILD
community/xwax/PKGBUILD
core/udev/PKGBUILD
extra/libplist/PKGBUILD
extra/mirage/PKGBUILD
extra/rdesktop/PKGBUILD
staging/gpsd/PKGBUILD
testing/pygobject/PKGBUILD
Diffstat (limited to 'community/flashrom')
0 files changed, 0 insertions, 0 deletions