diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 16:50:25 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 16:50:25 -0300 |
| commit | b6aef2fa31eefccec41172ba32ece5326c729291 (patch) | |
| tree | 7a6e6efcc20c45c379f244ea388dda5e1a0c2334 /libre/mplayer-libre/mplayer.desktop | |
| parent | dccab1509d2289e66edf699d1f90d127648fdeeb (diff) | |
| parent | 13bf0e2a4ebb6c8b591b204f4c2e3c8e73e6fe18 (diff) | |
| download | abslibre-b6aef2fa31eefccec41172ba32ece5326c729291.tar.gz abslibre-b6aef2fa31eefccec41172ba32ece5326c729291.tar.bz2 abslibre-b6aef2fa31eefccec41172ba32ece5326c729291.zip | |
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre
Conflicts:
libre/kernel26-libre-lts/PKGBUILD
libre/kernel26-libre-lts/config.x86_64
Diffstat (limited to 'libre/mplayer-libre/mplayer.desktop')
0 files changed, 0 insertions, 0 deletions