diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-06 12:13:36 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-06 12:13:36 -0300 |
| commit | 4a9023500f5b915ccbf556296c756ce3f2faef5b (patch) | |
| tree | 28258893f8d5094fdb84ede1e97afa36a5276696 /extra/usbview | |
| parent | 3dac66779d53dc58badb4f964177f7692c1bd92c (diff) | |
| parent | bdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gcc/PKGBUILD
extra/shared-mime-info/PKGBUILD
extra/smb4k/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
multilib/gcc-multilib/PKGBUILD
testing/xfig/PKGBUILD
Diffstat (limited to 'extra/usbview')
0 files changed, 0 insertions, 0 deletions