diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-05 09:35:40 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-05 09:35:40 -0300 |
| commit | 2e27d8d9808d5d65c1d6f39b629fbe956b294697 (patch) | |
| tree | 8811c7a4e5b81100d1f0542367ae623356038ae8 /~xihh/retroshare/retroshare.desktop | |
| parent | e4110059fee6ff87ee66fe88c17b47848b9bf49d (diff) | |
| parent | 947a049195183934ba5dffc131f9512fe253f4db (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/lshw/PKGBUILD
extra/ardour/PKGBUILD
Diffstat (limited to '~xihh/retroshare/retroshare.desktop')
0 files changed, 0 insertions, 0 deletions