diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-13 19:51:35 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-13 19:51:35 -0300 |
commit | a552e7fe41f2145b6e785ce03c6b2d8920ab7b43 (patch) | |
tree | c938070c363db70f111d058c4fccc781ff0dea0b /community/mednafen | |
parent | 0a15db3fa6f40e080010ab6c553b1ce9e32db4a9 (diff) | |
parent | 7c64c5039335c73eaa1a402c417235e8ca9a5109 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/emesene/PKGBUILD
community/minidlna/PKGBUILD
community/uzbl/PKGBUILD
community/virtualbox/PKGBUILD
extra/lirc/PKGBUILD
libre/pacman/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
testing/subversion/PKGBUILD
Diffstat (limited to 'community/mednafen')
0 files changed, 0 insertions, 0 deletions