diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-12 17:24:29 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-12 17:24:29 -0300 |
| commit | 20325742c50f83cc58e49aa3b8347fde1399d734 (patch) | |
| tree | c165cfbea80913f12dad4d009a70d9fe5e8bfceb /~fauno | |
| parent | 42512f0cff006451fa78981bf2f41e819fe96131 (diff) | |
| parent | 6a2547c3f20da8a8df65a8032a01677b74b6ece7 (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Conflicts:
community/mplayer2/PKGBUILD
extra/live-media/PKGBUILD
Diffstat (limited to '~fauno')
0 files changed, 0 insertions, 0 deletions